diff --git a/Form-Controls/index.html b/Form-Controls/index.html
index 65a866cdb..d01ec5017 100644
--- a/Form-Controls/index.html
+++ b/Form-Controls/index.html
@@ -14,14 +14,67 @@ <h1>Product Pick</h1>
     <main>
       <form>
         <!-- write your html here-->
-        <!-- 
-          try writing out the requirements first as comments
+        <fieldset>
+          <legend>Order your T-shirt</legend>
+          <legend>Your name  registered with us</legend>
+          <div id="name-field">
+            <!-- customer valid name-->
+            <label for="name">Name:</label>
+            <input 
+              type="text" 
+              id="name" 
+              name="name" 
+              minlength="2" 
+              placeholder="enter your name"
+              required 
+            />
+          </div>
+          <legend>Your email registered with us</legend>
+          <div id="email-field">
+            <!-- customer valid email-->
+            <label for="email">Email:</label>
+            <input 
+              type="email" 
+              id="email" 
+              name="email" 
+              placeholder="enter your email"
+              required 
+            />
+          </div>
+          <legend>Please choose the color of T-shirt you like</legend>
+          <div id="tshirt-color">
+            <!-- color of the T-shirt-->
+            <label for="color">T-shirt Color:</label>
+            <select id="color" name="color" required>
+              <option value="" disabled selected>Select a color</option>
+              <option value="blue">Blue</option>
+              <option value="black">Black</option>
+              <option value="white">White</option>
+            </select>
+          </div>
+          <legend>Please choose the size of T-shirt you like</legend>
+          <div id="tshirt-size">
+            <!-- size of the T-shirt-->   
+            <label for="size">T-shirt Size:</label>
+            <select id="size" name="size" required>
+              <option value="" disabled selected>Select a 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>
+          </div>     
+        </fieldset>
+        <!-- try writing out the requirements first as comments
         this will also help you fill in your PR message later-->
+        <button id="submit-button" type="submit">Submit order</button>
       </form>
     </main>
     <footer>
       <!-- change to your name-->
-      <h2>By HOMEWORK SOLUTION</h2>
+      <h2>By Tze Ming Ho</h2>
     </footer>
   </body>
 </html>