diff --git a/Form-Controls/index.html b/Form-Controls/index.html
index 65a866cdb..f2e348f94 100644
--- a/Form-Controls/index.html
+++ b/Form-Controls/index.html
@@ -1,27 +1,71 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <title>My form exercise</title>
-    <meta name="description" content="" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-  </head>
-  <body>
-    <header>
-      <h1>Product Pick</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-->
-      </form>
-    </main>
-    <footer>
-      <!-- change to your name-->
-      <h2>By HOMEWORK SOLUTION</h2>
-    </footer>
-  </body>
+<head>
+  <meta charset="utf-8">
+  <title>My form exercise</title>
+  <meta name="description" content="">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+
+<body>
+  <header>
+    <h1>Order a T-shirt</h1>
+  </header>
+
+  <main>
+    <form action="#" method="post">
+      <div>
+
+        <!-- Customer Details Section -->
+        <fieldset>
+          <legend>Customer Details</legend>
+
+          <div>
+            <label for="name">Name</label><br>
+            <input type="text" id="name" name="name" minlength="2" required
+              pattern=".*\S.*"
+              title="Name must contain at least one non-space character">
+          </div>
+
+          <br>
+
+          <div>
+            <label for="email">Email</label><br>
+            <input type="email" id="email" name="email" required>
+          </div>
+        </fieldset>
+
+        <br>
+
+        <fieldset>
+          <legend>T-shirt Colour</legend>
+          <label><input type="radio" name="colour" value="red" required> Red</label>
+          <label><input type="radio" name="colour" value="blue"> Blue</label>
+          <label><input type="radio" name="colour" value="black"> Black</label>
+        </fieldset>
+
+        <br>
+
+        <fieldset>
+          <legend>T-shirt Size</legend>
+          <label><input type="radio" name="size" value="XS" required> XS</label>
+          <label><input type="radio" name="size" value="S"> S</label>
+          <label><input type="radio" name="size" value="M"> M</label>
+          <label><input type="radio" name="size" value="L"> L</label>
+          <label><input type="radio" name="size" value="XL"> XL</label>
+          <label><input type="radio" name="size" value="XXL"> XXL</label>
+        </fieldset>
+
+        <br>
+
+        <button type="submit">Submit</button>
+
+      </div>
+    </form>
+  </main>
+
+  <footer>
+    <p>By Karim M'hamdi</p>
+  </footer>
+</body>
 </html>
