diff --git a/Form-Controls/index.html b/Form-Controls/index.html
index 74b591ffc..d39c1fd2b 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" />
@@ -13,15 +13,75 @@ <h1>Product Pick</h1>
     </header>
     <main>
       <form>
-        <!-- write your html here-->
-        <!-- 
-          try writing out the requirements first as comments
+        <!-- try writing out the requirements first as comments
         this will also help you fill in your PR message later-->
+        <fieldset>
+          <legend>Your details</legend>
+
+          <!-- Customer name: required, at least two non-space characters -->
+          <label for="customer-name">Name</label>
+          <input
+            id="customer-name"
+            name="customer-name"
+            type="text"
+            required
+            pattern=".*\S.*\S.*"
+            title="Please enter your name, or at least two non-space characters."
+          />
+
+          <!-- Customer email: required, valid email format -->
+          <label for="customer-email">Email</label>
+          <input
+            id="customer-email"
+            name="customer-email"
+            type="email"
+            required
+          />
+        </fieldset>
+
+        <!-- T-shirt colour: required, 3 choices -->
+        <fieldset>
+          <legend>T-shirt colour</legend>
+
+          <label>
+            <input type="radio" name="colour" value="black" required />
+            Black
+          </label>
+
+          <label>
+            <input type="radio" name="colour" value="white" />
+            White
+          </label>
+
+          <label>
+            <input type="radio" name="colour" value="blue" />
+            Blue
+          </label>
+        </fieldset>
+
+        <!-- T-shirt size: required, XS, S, M, L, XL, XXL -->
+        <fieldset>
+          <legend>T-shirt size</legend>
+
+          <label for="tshirt-size">Size</label>
+          <select id="tshirt-size" name="tshirt-size" required>
+            <option value="">Select size</option>
+            <option value="xs">XS</option>
+            <option value="s">S</option>
+            <option value="m">M</option>
+            <option value="l">L</option>
+            <option value="xl">XL</option>
+            <option value="xxl">XXL</option>
+          </select>
+        </fieldset>
+
+        <!-- Submit button -->
+        <button type="submit">Order T-shirt</button>
       </form>
     </main>
     <footer>
       <!-- change to your name-->
-      <p>By HOMEWORK SOLUTION</p>
+      <p>By Martim Lou</p>
     </footer>
   </body>
 </html>
