diff --git a/Form-Controls/index.html b/Form-Controls/index.html
index 65a866cdb..cf2fdf5f7 100644
--- a/Form-Controls/index.html
+++ b/Form-Controls/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
@@ -9,19 +9,52 @@
   </head>
   <body>
     <header>
-      <h1>Product Pick</h1>
+      <h1>Dave's T-shirt Factory</h1>
     </header>
     <main>
       <form>
-        <!-- write your html here-->
-        <!-- 
-          try writing out the requirements first as comments
-        this will also help you fill in your PR message later-->
+        <fieldset>
+          <legend><h2>Customer's Details:</h2></legend>
+
+          <label for="customer-name">Name</label>
+          <input name="customer-name" type="text" minlength="2" id="customer-name" required />
+
+          <label for="customer-surname">Surname</label>
+          <input name="customer-surname" type="text" minlength="2" id="customer-surname" required />
+
+          <label for="customer-email">E-mail</label>
+          <input name="customer-email" type="email" id="customer-email" required />
+        </fieldset>
+        <fieldset>
+          <legend><h2>Pick a T-shirt:</h2></legend>
+          <label for="tshirt-color"><strong>T-shirt Color:</strong> </label>
+          <select name="tshirt-color" id="tshirt-color" required>
+            <option value="">Color</option>
+            <option value="yellow">Yellow</option>
+            <option value="green">Green</option>
+            <option value="burgundy">Burgundy</option>
+            <br /><br />
+          </select>
+          <p><strong>T-shirt Size:</strong></p>
+          <input name="tshirt-size" type="radio" id="xs" value="xs" required />
+          <label for="xs">XS</label>
+          <input name="tshirt-size" type="radio" id="s" value="s" />
+          <label for="s">S</label>
+          <input name="tshirt-size" type="radio" id="m" value="m" />
+          <label for="m">M</label>
+          <input name="tshirt-size" type="radio" id="l" value="l" />
+          <label for="l">L</label>
+          <input name="tshirt-size" type="radio" id="xl" value="xl" />
+          <label for="xl">XL</label>
+          <input name="tshirt-size" type="radio" id="xxl" value="xxl" />
+          <label for="xxl">XXL</label>
+        </fieldset>
+        <br /><br />
+        <input type="submit" value="Place Order" />
       </form>
     </main>
     <footer>
-      <!-- change to your name-->
-      <h2>By HOMEWORK SOLUTION</h2>
+      <p>By Alexandru Pocovnicu</p>
     </footer>
   </body>
 </html>
