diff --git a/package-lock.json b/package-lock.json
index c51d81cb..9d4705bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1615,9 +1615,9 @@
       "dev": true
     },
     "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true
     },
     "live-server": {
@@ -2631,9 +2631,9 @@
       }
     },
     "websocket-extensions": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
-      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true
     },
     "which": {
diff --git a/package.json b/package.json
index c9808dbe..c808e6fd 100644
--- a/package.json
+++ b/package.json
@@ -5,35 +5,35 @@
   "author": "Codi",
   "license": "ISC",
   "scripts": {
-    "1": "live-server --open=week-1/1-parent-child",
-    "2": "live-server --open=week-1/2-html-attributes",
-    "3": "live-server --open=week-1/3-semantic-html",
-    "4": "live-server --open=week-1/4-links-scripts",
-    "5": "live-server --open=week-1/5-css-selectors",
-    "6": "live-server --open=week-1/6-css-properties",
-    "7": "live-server --open=week-1/7-css-box",
-    "8": "live-server --open=week-1/8-advanced-selectors",
-    "9": "live-server --open=week-1/9-git-branch",
-    "10": "live-server --open=week-2/10-media-queries",
-    "11": "live-server --open=week-2/11-flexbox",
-    "12": "live-server --open=week-2/12-justify-content",
-    "13": "live-server --open=week-2/13-align-items",
-    "14": "live-server --open=week-2/14-order",
-    "15": "live-server --open=week-2/15-align-self",
-    "16": "live-server --open=week-2/16-more-flexbox",
-    "17": "live-server --open=week-2/17-nav-menu",
-    "18": "live-server --open=week-2/18-git-merge",
-    "19": "live-server --open=week-3/19-search",
-    "20": "live-server --open=week-3/20-labels",
-    "21": "live-server --open=week-3/21-buttons",
-    "22": "live-server --open=week-3/22-checkout",
-    "23": "live-server --open=week-3/23-comments",
-    "24": "live-server --open=week-3/24-dietary",
-    "25": "live-server --open=week-3/25-shirt-size",
-    "26": "live-server --open=week-3/26-checkout-groups",
-    "27": "live-server --open=week-3/27-attributes",
-    "28": "live-server --open=week-3/28-git-conflict",
-    "29": "live-server --open=week-3/29-combined-skills",
+    "1": "live-server --open=part-1/1-parent-child",
+    "2": "live-server --open=part-1/2-html-attributes",
+    "3": "live-server --open=part-1/3-semantic-html",
+    "4": "live-server --open=part-1/4-links-scripts",
+    "5": "live-server --open=part-1/5-css-selectors",
+    "6": "live-server --open=part-1/6-css-properties",
+    "7": "live-server --open=part-1/7-css-box",
+    "8": "live-server --open=part-1/8-advanced-selectors",
+    "9": "live-server --open=part-1/9-git-branch",
+    "10": "live-server --open=part-2/10-media-queries",
+    "11": "live-server --open=part-2/11-flexbox",
+    "12": "live-server --open=part-2/12-justify-content",
+    "13": "live-server --open=part-2/13-align-items",
+    "14": "live-server --open=part-2/14-order",
+    "15": "live-server --open=part-2/15-align-self",
+    "16": "live-server --open=part-2/16-more-flexbox",
+    "17": "live-server --open=part-2/17-nav-menu",
+    "18": "live-server --open=part-2/18-git-merge",
+    "19": "live-server --open=part-3/19-search",
+    "20": "live-server --open=part-3/20-labels",
+    "21": "live-server --open=part-3/21-buttons",
+    "22": "live-server --open=part-3/22-checkout",
+    "23": "live-server --open=part-3/23-comments",
+    "24": "live-server --open=part-3/24-dietary",
+    "25": "live-server --open=part-3/25-shirt-size",
+    "26": "live-server --open=part-3/26-checkout-groups",
+    "27": "live-server --open=part-3/27-attributes",
+    "28": "live-server --open=part-3/28-git-conflict",
+    "29": "live-server --open=part-3/29-combined-skills",
     "precommit": "pretty-quick --staged --verbose",
     "serve": "live-server"
   },
diff --git a/part-1/1-parent-child/index.html b/part-1/1-parent-child/index.html
index 458a4cb2..24036e81 100644
--- a/part-1/1-parent-child/index.html
+++ b/part-1/1-parent-child/index.html
@@ -27,6 +27,7 @@
           <p class="message__content">
             I can meet on Tuesday and Wednesday after 4.
           </p>
+          <time class="message__time">7:15pm</time>
         </div>
       </div>
     </div>
diff --git a/part-1/2-html-attributes/index.html b/part-1/2-html-attributes/index.html
index dc861fa4..34707785 100644
--- a/part-1/2-html-attributes/index.html
+++ b/part-1/2-html-attributes/index.html
@@ -23,14 +23,15 @@
         <div class="message">
           <div class="message__author">Luke</div>
           <p class="message__content">
-            Let's meet at the iCafe in Merchant City. https://goo.gl/maps/aza4h9nUBhn
+            Let's meet at the <a href="https://goo.gl/maps/aza4h9nUBhn">iCafe</a> in Merchant City.
+            https://goo.gl/maps/aza4h9nUBhn
           </p>
           <span class="message__time">7:35pm</span>
         </div>
         <div class="message">
           <div class="message__author">Won</div>
           <p class="message__content">
-            Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif
+            Ok! <img src="https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif" />
           </p>
           <span class="message__time">7:38pm</span>
         </div>
diff --git a/part-1/3-semantic-html/index.html b/part-1/3-semantic-html/index.html
index 3640deaf..38934b74 100644
--- a/part-1/3-semantic-html/index.html
+++ b/part-1/3-semantic-html/index.html
@@ -12,30 +12,32 @@
 
   <body>
     <div class="site-wrapper">
-      <div class="site-header">
+      <header role="banner" class="site-header">
         <div class="site-header__title">Messages</div>
-      </div>
-      <div class="messages">
-        <div class="message">
+      </header>
+      <main role="main" class="messages">
+        <article class="message">
           <div class="message__author">Won</div>
-          <p class="message__content">Where should we meet later?</p>
-          <span class="message__time">Mar 25, 2018 7:25pm</span>
-        </div>
-        <div class="message">
+          <div class="message__content">Where should we meet later?</div>
+          <time class="message__time" datetime="2018-03-25 19:25pm">Mar 25, 2018 7:25pm</time>
+        </article>
+
+        <article class="message">
           <div class="message__author">Luke</div>
-          <p class="message__content">
+          <article role="main" class="message__content">
             Let's meet at the iCafe in Merchant City. https://goo.gl/maps/aza4h9nUBhn
-          </p>
-          <span class="message__time">Mar 25, 2018 7:35pm</span>
-        </div>
-        <div class="message">
+          </article>
+          <time class="message__time" datetime="2018-03-25 19:35pm">Mar 25, 2018 7:35pm</time>
+        </article>
+
+        <article class="message">
           <div class="message__author">Won</div>
           <p class="message__content">
             Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif
           </p>
-          <span class="message__time">Mar 25, 2018 7:38pm</span>
-        </div>
-      </div>
+          <time class="message__time" datetime="2018-03-25 19:38pm">Mar 25, 2018 7:38pm</time>
+        </article>
+      </main>
       <div id="result" class="result"></div>
     </div>
     <script defer src="/js/3-result.js"></script>
diff --git a/part-1/4-links-scripts/index.html b/part-1/4-links-scripts/index.html
index 303c7fbd..b7574e07 100644
--- a/part-1/4-links-scripts/index.html
+++ b/part-1/4-links-scripts/index.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8" />
     <title>4. Adding Links and Scripts - HTML, CSS and Git Exercises</title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="stylesheet" href="/part-1/4-links-scripts/css/missing-styles.css" />
   </head>
 
   <body>
@@ -33,5 +34,6 @@
         </div>
       </div>
     </div>
+    <script src="/part-1/4-links-scripts/js/convertUrls.js"></script>
   </body>
 </html>
diff --git a/part-1/5-css-selectors/message-backgrounds.css b/part-1/5-css-selectors/message-backgrounds.css
index ffe48332..50d5e2a4 100644
--- a/part-1/5-css-selectors/message-backgrounds.css
+++ b/part-1/5-css-selectors/message-backgrounds.css
@@ -1 +1,11 @@
 /* Add your CSS code below */
+#first-message {
+  background-color: red;
+}
+article {
+  background-color: cadetblue;
+}
+
+.message--latest {
+  background-color: yellow;
+}
diff --git a/part-1/6-css-properties/styles.css b/part-1/6-css-properties/styles.css
index ffe48332..17efd6bd 100644
--- a/part-1/6-css-properties/styles.css
+++ b/part-1/6-css-properties/styles.css
@@ -1 +1,18 @@
 /* Add your CSS code below */
+.link {
+  text-decoration: none;
+  font-weight: bold;
+  color: red;
+}
+.message__time {
+  font-size: 0.9rem;
+}
+.message--unread {
+  border-left: 5px solid blue;
+}
+.message__time--old {
+  opacity: 50%;
+}
+.message {
+  margin-bottom: 2.8rem;
+}
diff --git a/part-1/7-css-box/styles.css b/part-1/7-css-box/styles.css
index 013b94f1..f71c831b 100644
--- a/part-1/7-css-box/styles.css
+++ b/part-1/7-css-box/styles.css
@@ -4,3 +4,7 @@
   border-radius: 4px;
   background: #fff;
 }
+
+.countries li {
+  margin-bottom: 2.5rem;
+}
diff --git a/part-1/8-advanced-selectors/styles.css b/part-1/8-advanced-selectors/styles.css
index d35c3c37..3cfe4b4f 100644
--- a/part-1/8-advanced-selectors/styles.css
+++ b/part-1/8-advanced-selectors/styles.css
@@ -1 +1,13 @@
 /* Try different box model properties below */
+.site-header > p {
+  color: white;
+  margin-bottom: 0.5rem;
+}
+
+.site-footer > p {
+  font-size: 12px;
+  text-align: center;
+}
+.message:last-child {
+  box-shadow: 4px 4px 0 #dba944;
+}
diff --git a/part-1/9-git-branch/styles.css b/part-1/9-git-branch/styles.css
index 0051cdba..bc4104b3 100644
--- a/part-1/9-git-branch/styles.css
+++ b/part-1/9-git-branch/styles.css
@@ -1,6 +1,6 @@
 /* Add your own CSS code below */
 .link {
-  color: #4491db;
+  color: green;
   font-weight: 700;
   text-decoration: none;
 }
diff --git a/part-2/10-media-queries/columns.css b/part-2/10-media-queries/columns.css
index 43e80d23..711e9b95 100644
--- a/part-2/10-media-queries/columns.css
+++ b/part-2/10-media-queries/columns.css
@@ -1 +1,12 @@
 /* Add your own CSS code below */
+@media screen and (max-width: 768px) {
+  .countries {
+    columns: 2;
+  }
+}
+
+@media screen and (max-width: 1200px) {
+  .countries {
+    columns: 3;
+  }
+}
diff --git a/part-2/11-flexbox/flexbox.css b/part-2/11-flexbox/flexbox.css
index 43e80d23..e7345304 100644
--- a/part-2/11-flexbox/flexbox.css
+++ b/part-2/11-flexbox/flexbox.css
@@ -1 +1,11 @@
 /* Add your own CSS code below */
+.container {
+  display: flex;
+}
+.countries--first {
+  flex-direction: row-reverse;
+}
+
+.countries--third {
+  flex-direction: column-reverse;
+}
diff --git a/part-2/11-flexbox/index.html b/part-2/11-flexbox/index.html
index 11dc3dbb..989b370f 100644
--- a/part-2/11-flexbox/index.html
+++ b/part-2/11-flexbox/index.html
@@ -24,7 +24,7 @@ <h1 class="site-header__title">Exercises</h1>
       <div class="panel">
         <div class="exercise">
           <h2 class="exercise__title">First</h2>
-          <ul class="countries countries--first">
+          <ul class="countries container countries--first">
             <li class="country">1. Brazil</li>
             <li class="country">2. Croatia</li>
             <li class="country">3. Ethiopia</li>
@@ -40,7 +40,7 @@ <h3 class="solution__title">Solution</h3>
       <div class="panel">
         <div class="exercise">
           <h2 class="exercise__title">Second</h2>
-          <ul class="countries countries--second">
+          <ul class="countries container countries--second">
             <li class="country">1. Brazil</li>
             <li class="country">2. Croatia</li>
             <li class="country">3. Ethiopia</li>
@@ -56,7 +56,7 @@ <h3 class="solution__title">Solution</h3>
       <div class="panel">
         <div class="exercise">
           <h2 class="exercise__title">Third</h2>
-          <ul class="countries countries--third">
+          <ul class="countries container countries--third">
             <li class="country">1. Brazil</li>
             <li class="country">2. Croatia</li>
             <li class="country">3. Ethiopia</li>
diff --git a/part-2/12-justify-content/flexbox.css b/part-2/12-justify-content/flexbox.css
index 3c4c7ff1..8f8c858f 100644
--- a/part-2/12-justify-content/flexbox.css
+++ b/part-2/12-justify-content/flexbox.css
@@ -7,3 +7,13 @@
 }
 
 /* Add your own CSS code below */
+
+.countries--third {
+  flex-direction: column;
+  justify-content: flex-end;
+}
+
+.countries--fourth {
+  flex-direction: column-reverse;
+  justify-content: space-between;
+}
diff --git a/part-2/13-align-items/flexbox.css b/part-2/13-align-items/flexbox.css
index 3675a0df..2f6385f4 100644
--- a/part-2/13-align-items/flexbox.css
+++ b/part-2/13-align-items/flexbox.css
@@ -2,3 +2,22 @@
   display: flex;
 }
 /* Add your own CSS code below */
+.countries--first {
+  align-items: center;
+  flex-direction: row;
+}
+
+.countries--second {
+  align-items: flex-end;
+  flex-direction: row-reverse;
+}
+
+.countries--third {
+  align-items: flex-end;
+  flex-direction: column;
+}
+
+.countries--fourth {
+  align-items: center;
+  flex-direction: column-reverse;
+}
diff --git a/part-2/14-order/flexbox.css b/part-2/14-order/flexbox.css
index ed621b79..06a5d1d7 100644
--- a/part-2/14-order/flexbox.css
+++ b/part-2/14-order/flexbox.css
@@ -3,3 +3,16 @@
 }
 
 /* Add your own CSS code below */
+.countries--first .country--brazil {
+  order: 5;
+}
+
+.countries--second .country--brazil {
+  order: 4;
+}
+.countries--second .country--uganda {
+  order: 5;
+}
+.countries--third {
+  flex-direction: row-reverse;
+}
diff --git a/part-2/15-align-self/flexbox.css b/part-2/15-align-self/flexbox.css
index ed621b79..e6379711 100644
--- a/part-2/15-align-self/flexbox.css
+++ b/part-2/15-align-self/flexbox.css
@@ -3,3 +3,34 @@
 }
 
 /* Add your own CSS code below */
+
+.countries--first .country--ethiopia {
+  align-self: flex-end;
+}
+
+.countries--second {
+  align-items: center;
+}
+
+.countries--second .country--ethiopia {
+  align-self: flex-end;
+}
+
+.countries--third {
+  align-items: flex-end;
+}
+
+.countries--third .country--brazil {
+  align-self: flex-start;
+}
+.countries--third .country--uganda {
+  align-self: flex-start;
+}
+
+.countries--fourth {
+  flex-direction: column;
+  align-items: flex-start;
+}
+.countries--fourth .country--uganda {
+  align-self: center;
+}
diff --git a/part-2/16-more-flexbox/flexbox.css b/part-2/16-more-flexbox/flexbox.css
index ed621b79..b0a64374 100644
--- a/part-2/16-more-flexbox/flexbox.css
+++ b/part-2/16-more-flexbox/flexbox.css
@@ -3,3 +3,36 @@
 }
 
 /* Add your own CSS code below */
+.countries--second {
+  align-items: flex-end;
+}
+.countries--third {
+  align-items: flex-start;
+}
+.countries--third .country--brazil {
+  align-self: flex-end;
+}
+.countries--fourth {
+  flex-direction: column;
+  align-items: flex-end;
+}
+.countries--fourth .country--ethiopia {
+  align-self: flex-start;
+}
+.countries--fourth .country--laos {
+  align-self: flex-start;
+}
+
+.countries--fifth {
+  flex-direction: column-reverse;
+  align-items: flex-end;
+  justify-content: space-between;
+}
+
+.countries--fifth .country--laos {
+  order: 4;
+}
+
+.countries--fifth .country--uganda {
+  align-self: center;
+}
diff --git a/part-2/17-nav-menu/styles.css b/part-2/17-nav-menu/styles.css
index f04f4c7b..71542886 100644
--- a/part-2/17-nav-menu/styles.css
+++ b/part-2/17-nav-menu/styles.css
@@ -1 +1,10 @@
 /* Write your media queries and flexbox CSS below */
+@media screen and (max-width: 480px) {
+  .site-header {
+    columns: 3;
+  }
+}
+
+.site-header {
+  flex-direction: column;
+}
diff --git a/part-2/18-git-merge/styles.css b/part-2/18-git-merge/styles.css
index 0051cdba..af46a4f7 100644
--- a/part-2/18-git-merge/styles.css
+++ b/part-2/18-git-merge/styles.css
@@ -1,6 +1,6 @@
 /* Add your own CSS code below */
 .link {
-  color: #4491db;
+  color: orangered;
   font-weight: 700;
   text-decoration: none;
 }
diff --git a/part-3/19-search/index.html b/part-3/19-search/index.html
index d94ec98d..e7544dbd 100644
--- a/part-3/19-search/index.html
+++ b/part-3/19-search/index.html
@@ -11,7 +11,9 @@
   <body>
     <div class="site-wrapper">
       <main>
-        <p>Delete this line and add your form.</p>
+        <form method="GET" action="https://www.google.com/search">
+          <input type="text" name="q" />
+        </form>
       </main>
     </div>
   </body>
diff --git a/part-3/20-labels/index.html b/part-3/20-labels/index.html
index ccdc8171..26aa6330 100644
--- a/part-3/20-labels/index.html
+++ b/part-3/20-labels/index.html
@@ -12,8 +12,8 @@
     <div class="site-wrapper">
       <main>
         <form method="GET" action="https://www.google.com/search">
-          <!-- Add a label here -->
-          <input type="text" name="q" />
+          <label for="search-input"> Search on Google</label>
+          <input type="text" name="q" id="search-input" />
         </form>
       </main>
     </div>
diff --git a/part-3/21-buttons/index.html b/part-3/21-buttons/index.html
index ff87846d..fb566048 100644
--- a/part-3/21-buttons/index.html
+++ b/part-3/21-buttons/index.html
@@ -14,7 +14,7 @@
         <form method="GET" action="https://www.google.com/search">
           <label for="search-input">Search on Google</label>
           <input type="text" name="q" id="search-input" />
-          <!-- Add a submit button here -->
+          <button type="submit">Search</button>
         </form>
       </main>
     </div>
diff --git a/part-3/22-checkout/index.html b/part-3/22-checkout/index.html
index 4c42ebba..c77a83cf 100644
--- a/part-3/22-checkout/index.html
+++ b/part-3/22-checkout/index.html
@@ -37,7 +37,14 @@ <h1 class="shopping-basket__title">Your Shopping Basket</h1>
         <div class="checkout">
           <h2 class="checkout__title">Checkout</h2>
           <form method="GET" id="checkout-form" class="checkout__form">
-            <!-- Add the form fields here -->
+            <label for="name-input"> Enter your name</label>
+            <input type="text" name="customer-name" id="name-input" />
+
+            <label for="email-input"> Enter your Email </label>
+            <input type="Email" name="customer-Email" id="email-input" />
+
+            <label for="phone-input">Enter your Phone number </label>
+            <input type="tel" name="customer-phone" id="phone-input" />
 
             <button type="submit">Complete Purchase</button>
           </form>
diff --git a/part-3/23-comments/index.html b/part-3/23-comments/index.html
index 110a5027..eb305c5f 100644
--- a/part-3/23-comments/index.html
+++ b/part-3/23-comments/index.html
@@ -31,7 +31,11 @@ <h1>Our t-shirts are amazing!</h1>
         <div class="comments">
           <p>Add your comments and let us know what you think!</p>
 
-          <!-- Your comment form goes here -->
+          <form method="GET">
+            <label for="comment">To add your comments, Write below:</label>
+            <textarea name="Comment" id="comment"></textarea>
+            <button type="submit">Send Comment</button>
+
         </div>
       </main>
     </div>
diff --git a/part-3/24-dietary/index.html b/part-3/24-dietary/index.html
index 5593174b..ad65ecf3 100644
--- a/part-3/24-dietary/index.html
+++ b/part-3/24-dietary/index.html
@@ -19,7 +19,28 @@ <h1>Codi Summit</h1>
         </p>
 
         <form>
-          <!-- Your multiple choice goes here -->
+
+<fieldset>
+  <legend>Please select all of your dietary requirements</legend>
+
+          <input type="checkbox" id="Halal" >
+          <label for="Halal">Halal</label>
+<br>
+          <input type="checkbox" id="Kosher" >
+          <label for="Kosher">Kosher</label>
+          <br>
+          <input type="checkbox" id="vegetarian" >
+          <label for="vegetarian">vegetarian</label>
+          <br>
+
+          <input type="checkbox" id="Vegan" >
+          <label for="Vegan">Vegan</label>
+          <br>
+          <input type="checkbox" id="Gluten Free" >
+          <label for="Gluten Free">Gluten Free</label>
+
+
+</fieldset>
           <button type="submit">Submit</button>
         </form>
       </main>
diff --git a/part-3/25-shirt-size/index.html b/part-3/25-shirt-size/index.html
index 9e4d606f..e74e8956 100644
--- a/part-3/25-shirt-size/index.html
+++ b/part-3/25-shirt-size/index.html
@@ -29,7 +29,14 @@ <h1 class="shopping-basket__title">Your Shopping Basket</h1>
                 </div>
               </td>
               <td>
-                Medium
+                <select>
+
+<option value="Small">Small</option>
+
+<option value="Medium" selected>Medium</option>
+
+<option value="Large">Large</option>
+                </select>
               </td>
               <td>
                 1
diff --git a/part-3/25-shirt-size/styles.css b/part-3/25-shirt-size/styles.css
index f2831578..81ffc822 100644
--- a/part-3/25-shirt-size/styles.css
+++ b/part-3/25-shirt-size/styles.css
@@ -1 +1,6 @@
 /* Add your CSS below */
+.shopping-basket__title {
+    clip: rect(1px, 1px, 1px, 1px);
+    position: absolute !important;
+    left: -2000px;
+  }
\ No newline at end of file
diff --git a/part-3/26-checkout-groups/index.html b/part-3/26-checkout-groups/index.html
index 66513ddd..9287302e 100644
--- a/part-3/26-checkout-groups/index.html
+++ b/part-3/26-checkout-groups/index.html
@@ -38,6 +38,52 @@ <h1 class="shopping-basket__title">Your Shopping Basket</h1>
           <h2 class="checkout__title">Checkout</h2>
           <form method="GET" id="checkout-form" class="checkout__form">
             <!-- Add the form fields here -->
+<fieldset>
+
+<legend>Billing Address</legend>
+
+<label for="address1">Address Line 1</label>
+<input type="text" id="address1">
+
+
+<label for="l2">Address Line 2</label>
+<input type="text" id="l2">
+
+
+<label for="pcode">Postcode</label>
+<input type="text" id="pcode">
+
+
+<label for="city">City</label>
+<input type="text" id="city">
+
+</fieldset>
+
+<fieldset>
+
+  <legend>Delivery Address</legend>
+  
+  <label for="add1">Address Line 1</label>
+  <input type="text" id="add1">
+  
+  
+  <label for="line2">Address Line 2</label>
+  <input type="text" id="line2">
+  
+  
+  <label for="postcode">Postcode</label>
+  <input type="text" id="postcode">
+  
+  
+  <label for="town">City</label>
+  <input type="text" id="town">
+  
+  </fieldset>
+
+
+
+
+
 
             <button type="submit">Complete Purchase</button>
           </form>
diff --git a/part-3/27-attributes/index.html b/part-3/27-attributes/index.html
index e54fd838..04b3f56f 100644
--- a/part-3/27-attributes/index.html
+++ b/part-3/27-attributes/index.html
@@ -42,7 +42,7 @@ <h2 class="checkout__title">Checkout</h2>
               <legend>Billing Address</legend>
               <p>
                 <label for="billing-address-1">Address Line 1</label>
-                <input type="text" name="billing-address-1" id="billing-address-1" />
+                <input type="text" name="billing-address-1" id="billing-address-1" required/>
               </p>
               <p>
                 <label for="billing-address-2">Address Line 2</label>
@@ -50,18 +50,18 @@ <h2 class="checkout__title">Checkout</h2>
               </p>
               <p>
                 <label for="billing-postcode">Postcode</label>
-                <input type="text" name="billing-postcode" id="billing-postcode" />
+                <input type="text" name="billing-postcode" id="billing-postcode" required/>
               </p>
               <p>
                 <label for="billing-city">City</label>
-                <input type="text" name="billing-city" id="billing-city" />
+                <input type="text" name="billing-city" id="billing-city" required/>
               </p>
             </fieldset>
             <fieldset>
               <legend>Delivery Address</legend>
               <p>
                 <label for="delivery-address-1">Address Line 1</label>
-                <input type="text" name="delivery-address-1" id="delivery-address-1" />
+                <input type="text" name="delivery-address-1" id="delivery-address-1" required/>
               </p>
               <p>
                 <label for="delivery-address-2">Address Line 2</label>
@@ -72,16 +72,16 @@ <h2 class="checkout__title">Checkout</h2>
                 <input
                   type="text"
                   name="delivery-address-postcode"
-                  id="delivery-address-postcode"
+                  id="delivery-address-postcode" required
                 />
               </p>
               <p>
                 <label for="delivery-address-city">City</label>
-                <input type="text" name="delivery-address-city" id="delivery-address-city" />
+                <input type="text" name="delivery-address-city" id="delivery-address-city" required/>
               </p>
               <p>
                 <label for="delivery-country">Country</label>
-                <input type="text" name="delivery-country" id="delivery-country" />
+                <input type="text" name="delivery-country" id="delivery-country" value="United Kingdom" readonly/>
               </p>
               <fieldset>
                 <legend>Delivery Options</legend>
@@ -90,7 +90,7 @@ <h2 class="checkout__title">Checkout</h2>
                     type="radio"
                     name="delivery-option"
                     id="delivery-option"
-                    value="standard"
+                    value="standard" checked disabled
                   />
                   Royal Mail
                 </label>
diff --git a/part-3/28-git-conflict/styles.css b/part-3/28-git-conflict/styles.css
index af46a4f7..45802275 100644
--- a/part-3/28-git-conflict/styles.css
+++ b/part-3/28-git-conflict/styles.css
@@ -1,6 +1,6 @@
 /* Add your own CSS code below */
 .link {
-  color: orangered;
+  color: #ff00ea;
   font-weight: 700;
   text-decoration: none;
 }