diff --git a/js/3-result.js b/js/3-result.js
deleted file mode 100644
index 62baee7b7..000000000
--- a/js/3-result.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Check if exercise three has been completed
- */
-(function() {
-  var tests = [
-      {
-        name: "<header>",
-        result: false
-      },
-      {
-        name: 'role="main"',
-        result: false
-      },
-      {
-        name: "<article>",
-        result: false
-      },
-      {
-        name: "<time> (EXTRA CHALLENGE)",
-        result: false
-      }
-    ],
-    resultEl = document.getElementById("result"),
-    headerEl = document.querySelector(".site-header"),
-    mainEl = document.querySelector(".messages"),
-    articleEls = document.querySelectorAll(".message"),
-    timeEls = document.querySelectorAll(".message__time"),
-    correctTimes = ["2018-03-25 19:25", "2018-03-25 19:35", "2018-03-25 19:38"],
-    successMessage = "✔",
-    failMessage = "✘";
-
-  if (typeof headerEl !== "undefined" && headerEl.tagName === "HEADER") {
-    tests.find(function(test) {
-      return test.name === "<header>";
-    }).result = true;
-  }
-
-  if (
-    typeof mainEl !== "undefined" &&
-    mainEl.hasAttribute("role") &&
-    mainEl.getAttribute("role") === "main"
-  ) {
-    tests.find(function(test) {
-      return test.name === 'role="main"';
-    }).result = true;
-  }
-
-  if (articleEls.length) {
-    let result = true;
-    result.article = true;
-    articleEls.forEach(function(el) {
-      if (el.tagName !== "ARTICLE") {
-        result = false;
-      }
-    });
-    tests.find(function(test) {
-      return test.name === "<article>";
-    }).result = result;
-  }
-
-  if (timeEls.length) {
-    let result = true;
-    timeEls.forEach(function(el, index) {
-      if (
-        el.tagName !== "TIME" ||
-        !el.hasAttribute("dateTime") ||
-        new Date(el.getAttribute("dateTime")).getTime() !== new Date(correctTimes[index]).getTime()
-      ) {
-        result = false;
-      }
-    });
-    tests.find(function(test) {
-      return test.name === "<time> (EXTRA CHALLENGE)";
-    }).result = result;
-  }
-
-  tests.forEach(function(test) {
-    var resultMessage = test.result ? successMessage : failMessage;
-    var el = document.createElement("div");
-    el.className = "result__item";
-    el.appendChild(document.createTextNode(resultMessage + " Added " + test.name));
-    resultEl.appendChild(el);
-  });
-})();
diff --git a/package-lock.json b/package-lock.json
index b15084556..8e15d45d4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -768,7 +768,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -789,12 +790,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -809,17 +812,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -936,7 +942,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -948,6 +955,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -962,6 +970,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -969,12 +978,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -993,6 +1004,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -1073,7 +1085,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -1085,6 +1098,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -1170,7 +1184,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -1206,6 +1221,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -1225,6 +1241,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -1268,12 +1285,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
diff --git a/package.json b/package.json
index 319553f25..5a32c8045 100644
--- a/package.json
+++ b/package.json
@@ -42,5 +42,6 @@
     "husky": "^0.14.3",
     "prettier": "^1.14.2",
     "pretty-quick": "^1.6.0"
-  }
+  },
+  "dependencies": {}
 }
diff --git a/week-1/1-parent-child/index.html b/week-1/1-parent-child/index.html
index 458a4cb21..3c8abf1bc 100644
--- a/week-1/1-parent-child/index.html
+++ b/week-1/1-parent-child/index.html
@@ -27,6 +27,7 @@
           <p class="message__content">
             I can meet on Tuesday and Wednesday after 4.
           </p>
+          <span class="message__time">7:15pm</span>
         </div>
       </div>
     </div>
diff --git a/week-1/2-html-attributes/index.html b/week-1/2-html-attributes/index.html
index dc861fa4f..b3c07eabe 100644
--- a/week-1/2-html-attributes/index.html
+++ b/week-1/2-html-attributes/index.html
@@ -23,14 +23,14 @@
         <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.
           </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="//media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif" />
           </p>
           <span class="message__time">7:38pm</span>
         </div>
diff --git a/week-1/3-semantic-html/index.html b/week-1/3-semantic-html/index.html
index 3640deaff..f391e9980 100644
--- a/week-1/3-semantic-html/index.html
+++ b/week-1/3-semantic-html/index.html
@@ -11,33 +11,33 @@
   </head>
 
   <body>
-    <div class="site-wrapper">
+    <header class="site-wrapper">
       <div class="site-header">
         <div class="site-header__title">Messages</div>
       </div>
       <div class="messages">
-        <div class="message">
+        <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">
+          <time datetime="2018-03-25 19:25" class="message__time">Mar 25, 2018 7:25pm</time>
+        </article>
+        <article 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
           </p>
-          <span class="message__time">Mar 25, 2018 7:35pm</span>
-        </div>
-        <div class="message">
+          <time datetime="2018-03-25 19:35" class="message__time">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>
+          <time datetime="2018-03-25 19:38" class="message__time">Mar 25, 2018 7:38pm</time>
+        </article>
       </div>
       <div id="result" class="result"></div>
-    </div>
+    </header>
     <script defer src="/js/3-result.js"></script>
   </body>
 </html>
diff --git a/week-1/4-links-scripts/index.html b/week-1/4-links-scripts/index.html
index 303c7fbd2..188fb5b82 100644
--- a/week-1/4-links-scripts/index.html
+++ b/week-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="css/missing-styles.css" />
   </head>
 
   <body>
@@ -33,5 +34,6 @@
         </div>
       </div>
     </div>
+    <script src="/week-1/4-links-scripts/js/convertUrls.js"></script>
   </body>
 </html>
diff --git a/week-1/5-css-selectors/message-backgrounds.css b/week-1/5-css-selectors/message-backgrounds.css
index ffe483325..23eb2c5b9 100644
--- a/week-1/5-css-selectors/message-backgrounds.css
+++ b/week-1/5-css-selectors/message-backgrounds.css
@@ -1 +1,12 @@
 /* Add your CSS code below */
+#first-message {
+  background-color: red;
+}
+
+#second-message {
+  background-color: cadetblue;
+}
+
+#thirt-message {
+  background-color: yellow;
+}
diff --git a/week-1/6-css-properties/styles.css b/week-1/6-css-properties/styles.css
index ffe483325..d551d2b1b 100644
--- a/week-1/6-css-properties/styles.css
+++ b/week-1/6-css-properties/styles.css
@@ -1 +1,22 @@
 /* Add your CSS code below */
+.link {
+  color: red;
+  font-weight: bold;
+  text-decoration: none;
+}
+
+time.message__time {
+  font-size: 0.9rem;
+}
+
+.message--unread {
+  border-left: 2px solid blue;
+}
+
+.messages :first-child {
+  opacity: 0.5;
+}
+
+.message {
+  padding: 30px;
+}
diff --git a/week-1/7-css-box/styles.css b/week-1/7-css-box/styles.css
index 013b94f1e..23250bbc9 100644
--- a/week-1/7-css-box/styles.css
+++ b/week-1/7-css-box/styles.css
@@ -1,6 +1,15 @@
 /* Try different box model properties below */
+
+* {
+  border: 1px solid red;
+}
+
 .pages__page {
   border: 1px solid #4491db;
   border-radius: 4px;
   background: #fff;
 }
+
+.country {
+  padding: 15px;
+}
diff --git a/week-1/8-advanced-selectors/styles.css b/week-1/8-advanced-selectors/styles.css
index d35c3c371..ef46ddb42 100644
--- a/week-1/8-advanced-selectors/styles.css
+++ b/week-1/8-advanced-selectors/styles.css
@@ -1 +1,19 @@
 /* Try different box model properties below */
+
+.site-header p {
+  color: white;
+  margin-bottom: none;
+}
+
+.message__content {
+  margin-bottom: none;
+}
+
+.site-footer p {
+  font-size: 12px;
+  text-align: center;
+}
+
+.messages .message.message--unread:last-child {
+  box-shadow: 4px 4px 0 #dba944;
+}
diff --git a/week-2/10-media-queries/columns.css b/week-2/10-media-queries/columns.css
index 43e80d23c..bd6339320 100644
--- a/week-2/10-media-queries/columns.css
+++ b/week-2/10-media-queries/columns.css
@@ -1 +1,13 @@
 /* Add your own CSS code below */
+
+@media screen and (min-width: 768px) {
+  .countries {
+    columns: 2;
+  }
+}
+
+@media screen and (min-width: 1200px) {
+  .countries {
+    columns: 3;
+  }
+}
diff --git a/week-2/11-flexbox/flexbox.css b/week-2/11-flexbox/flexbox.css
index 43e80d23c..d986b69e4 100644
--- a/week-2/11-flexbox/flexbox.css
+++ b/week-2/11-flexbox/flexbox.css
@@ -1 +1,15 @@
 /* Add your own CSS code below */
+.countries--first {
+  display: flex;
+  flex-direction: row-reverse;
+}
+
+.countries {
+  font-family: sans-serif;
+  font-size: 15px;
+}
+
+.countries--third {
+  display: flex;
+  flex-direction: column-reverse;
+}
diff --git a/week-2/12-justify-content/flexbox.css b/week-2/12-justify-content/flexbox.css
index 3c4c7ff18..b9795a1a6 100644
--- a/week-2/12-justify-content/flexbox.css
+++ b/week-2/12-justify-content/flexbox.css
@@ -1,9 +1,30 @@
+* {
+  font-family: "Gill Sans", sans-serif;
+}
+
 .countries {
   display: flex;
 }
 
-.countries--second .country {
-  padding: 0.5em;
+.countries.countries--first {
+  justify-content: flex-end;
 }
 
-/* Add your own CSS code below */
+.countries.countries--second {
+  justify-content: space-between;
+}
+
+.countries.countries--second .country {
+  margin: 0px;
+  padding: 9px;
+}
+
+.countries--third {
+  flex-direction: column;
+  justify-content: flex-end;
+}
+
+.countries--fourth {
+  flex-direction: column-reverse;
+  justify-content: space-around;
+}
diff --git a/week-2/13-align-items/flexbox.css b/week-2/13-align-items/flexbox.css
index 3675a0df3..c977305e0 100644
--- a/week-2/13-align-items/flexbox.css
+++ b/week-2/13-align-items/flexbox.css
@@ -1,4 +1,29 @@
 .countries {
   display: flex;
+  font-family: sans-serif;
 }
+
 /* Add your own CSS code below */
+
+.countries--first {
+  flex-direction: row;
+  align-items: center;
+}
+
+.countries--second {
+  flex-direction: row;
+  align-items: flex-end;
+  justify-content: flex-end;
+}
+
+.countries--third {
+  flex-direction: column;
+  align-items: flex-end;
+  justify-content: flex-start;
+}
+
+.countries--fourth {
+  flex-direction: column-reverse;
+  align-items: center;
+  justify-content: flex-start;
+}
diff --git a/week-2/14-order/flexbox.css b/week-2/14-order/flexbox.css
index ed621b793..f6b3ccf83 100644
--- a/week-2/14-order/flexbox.css
+++ b/week-2/14-order/flexbox.css
@@ -3,3 +3,67 @@
 }
 
 /* Add your own CSS code below */
+
+/* FIRST */
+.countries--first .country--brazil {
+  order: 5;
+}
+
+.countries--first .country--croatia {
+  order: 1;
+}
+
+.countries--first .country--ethiopia {
+  order: 2;
+}
+
+.countries--first .country--laos {
+  order: 3;
+}
+
+.countries--first .country--uganda {
+  order: 4;
+}
+
+/* SECOND */
+
+.countries--second .country--brazil {
+  order: 4;
+}
+
+.countries--second .country--croatia {
+  order: 1;
+}
+
+.countries--second .country--ethiopia {
+  order: 2;
+}
+
+.countries--second .country--laos {
+  order: 3;
+}
+
+.countries--second .country--uganda {
+  order: 5;
+}
+
+/* THIRD*/
+.countries--third .country--brazil {
+  order: 5;
+}
+
+.countries--third .country--croatia {
+  order: 4;
+}
+
+.countries--third .country--ethiopia {
+  order: 3;
+}
+
+.countries--third .country--laos {
+  order: 2;
+}
+
+.countries--third .country--uganda {
+  order: 1;
+}
diff --git a/week-2/15-align-self/flexbox.css b/week-2/15-align-self/flexbox.css
index ed621b793..f4c756dde 100644
--- a/week-2/15-align-self/flexbox.css
+++ b/week-2/15-align-self/flexbox.css
@@ -2,4 +2,44 @@
   display: flex;
 }
 
+* {
+  font-family: sans-serif;
+}
+
 /* Add your own CSS code below */
+
+/* First */
+.countries--first .country--ethiopia {
+  align-self: flex-end;
+}
+
+/* SECOND */
+.countries--second {
+  align-items: center;
+}
+
+.countries--second .country--ethiopia {
+  align-self: flex-end;
+}
+
+/* THIRD*/
+.countries--third {
+  align-items: flex-end;
+}
+
+.countries--third .country--brazil,
+.country--uganda {
+  align-self: flex-start;
+}
+
+/* FOURTH */
+
+.countries--fourth {
+  flex-direction: column;
+  align-items: flex-start;
+}
+
+.countries--fourth .country--uganda {
+  flex-direction: column;
+  align-self: center;
+}
diff --git a/week-2/16-more-flexbox/flexbox.css b/week-2/16-more-flexbox/flexbox.css
index ed621b793..3467789ef 100644
--- a/week-2/16-more-flexbox/flexbox.css
+++ b/week-2/16-more-flexbox/flexbox.css
@@ -3,3 +3,69 @@
 }
 
 /* Add your own CSS code below */
+* {
+  font-family: sans-serif;
+}
+
+/* FIRST */
+
+.countries--first {
+  align-items: flex-end;
+  justify-content: flex-end;
+  width: 70%;
+}
+
+/* Second */
+
+.countries--second {
+  align-items: flex-end;
+  justify-content: center;
+  flex-direction: row-reverse;
+  width: 70%;
+}
+
+/* THIRD */
+
+.countries--third {
+  align-items: flex-start;
+  justify-content: center;
+  flex-direction: row;
+  width: 70%;
+}
+
+.countries--third .country--brazil {
+  align-self: flex-end;
+}
+
+/* FOURTH */
+
+.countries--fourth {
+  align-items: flex-end;
+  justify-content: center;
+  flex-direction: column;
+  width: 70%;
+}
+
+.countries--fourth .country--ethiopia,
+.countries--fourth .country--laos {
+  align-self: center;
+}
+
+/* Fifth */
+
+.countries--fifth {
+  align-items: flex-end;
+  justify-content: space-around;
+  flex-direction: column-reverse;
+  width: 70%;
+}
+
+.countries--fifth .country--laos {
+  order: 5;
+  align-self: flex-end;
+}
+
+.countries--fifth .country--uganda {
+  order: 4;
+  align-self: center;
+}
diff --git a/week-2/17-nav-menu/styles.css b/week-2/17-nav-menu/styles.css
index f04f4c7ba..bda5e6d99 100644
--- a/week-2/17-nav-menu/styles.css
+++ b/week-2/17-nav-menu/styles.css
@@ -1 +1,27 @@
 /* Write your media queries and flexbox CSS below */
+
+@media screen and (min-width: 480px) {
+  .site-header__nav {
+    display: flex;
+    flex-direction: row;
+  }
+}
+
+@media screen and (min-width: 700px) {
+  .site-header {
+    display: flex;
+    align-items: center;
+    flex-direction: row;
+  }
+
+  .site-header__nav {
+    display: flex;
+    flex-direction: row;
+  }
+}
+
+@media screen and (min-width: 992px) {
+  .site-header {
+    justify-content: space-between;
+  }
+}
diff --git a/week-2/18-git-merge/styles.css b/week-2/18-git-merge/styles.css
index 0051cdbaf..af46a4f77 100644
--- a/week-2/18-git-merge/styles.css
+++ b/week-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;
 }