diff --git a/src/index.html b/src/index.html
index 04bd19e..e1d02cc 100644
--- a/src/index.html
+++ b/src/index.html
@@ -4,14 +4,18 @@
     <meta charset="utf-8" />
     <title>JobSimulator.Dev</title>
     <link rel="stylesheet" href="styles.css" />
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato" />
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
+    <link
+      rel="stylesheet"
+      href="https://fonts.googleapis.com/css?family=Lato"
+    />
+    <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"
+    />
     <script src="script.js"></script>
   </head>
 
   <body>
-    <!-- Navbar -->
-    <!-- TODO: Fix Issue, Nav Buttons Don't Work (Desktop & Mobile) -->
     <nav class="top">
       <div class="bar blue card left-align large">
         <a
@@ -22,24 +26,57 @@
           title="Toggle Navigation Menu"
           ><i class="fa fa-bars"></i
         ></a>
-        <!-- TODO: Fix Issue, Desktop Nav Is Visible on Mobile -->
-        <a id="nav-logo" class="bar-item button padding-large white">JobSimulator.Dev</a>
-        <a id="nav-challenges" class="bar-item button padding-large hover-white">Browse Challenges</a>
-        <a id="nav-signup" class="bar-item button padding-large hover-white">Sign Up</a>
+        <a
+          href="#header"
+          id="nav-logo"
+          class="bar-item button padding-large white"
+          >JobSimulator.Dev</a
+        >
+        <a
+          href="#challenges"
+          id="nav-challenges"
+          class="bar-item button padding-large hover-white hide-small"
+          >Browse Challenges</a
+        >
+        <a
+          href="#signup"
+          id="nav-signup"
+          class="bar-item button padding-large hover-white hide-small"
+          >Sign Up</a
+        >
       </div>
 
       <!-- Navbar on small screens -->
-      <div id="mobile-nav" class="bar-block white hide hide-large hide-medium large">
-        <a id="mobile-nav-challenges" class="bar-item button padding-large">Browse Challenges</a>
-        <a id="mobile-nav-signup" class="bar-item button padding-large">Sign Up</a>
+      <div
+        id="mobile-nav"
+        class="bar-block white hide hide-large hide-medium large"
+      >
+        <a
+          id="mobile-nav-challenges"
+          class="bar-item button padding-large"
+          href="#challenges"
+          >Browse Challenges</a
+        >
+        <a
+          id="mobile-nav-signup"
+          class="bar-item button padding-large"
+          href="#signup"
+          >Sign Up</a
+        >
       </div>
     </nav>
 
     <!-- Header -->
-    <header id="header" class="container white center" style="padding: 128px 16px">
+    <header
+      id="header"
+      class="container white center"
+      style="padding: 128px 16px"
+    >
       <img id="jumbo-image" src="./banner-image.png" />
       <h1 class="margin jumbo">Want to test your software dev skills?</h1>
-      <a href="#signup" class="button blue padding-large large margin-top">Sign Up</a>
+      <a href="#signup" class="button blue padding-large large margin-top"
+        >Sign Up</a
+      >
     </header>
 
     <section id="challenges" class="row-padding pink padding-256 container">
@@ -52,13 +89,22 @@ <h1>Browse Our Challenges</h1>
             href="https://github.com/developer-job-simulation/vanilla-login-form"
             >Vanilla Login Form</a
           >
-          <a target="_blank" class="challenge-tile" href="https://github.com/developer-job-simulation/vanilla-table"
+          <a
+            target="_blank"
+            class="challenge-tile"
+            href="https://github.com/developer-job-simulation/vanilla-table"
             >Vanilla Table</a
           >
-          <a target="_blank" class="challenge-tile" href="https://github.com/developer-job-simulation/react-ecommerce"
+          <a
+            target="_blank"
+            class="challenge-tile"
+            href="https://github.com/developer-job-simulation/react-ecommerce"
             >React Ecommerce</a
           >
-          <a target="_blank" class="challenge-tile" href="https://github.com/developer-job-simulation/react-mui-table"
+          <a
+            target="_blank"
+            class="challenge-tile"
+            href="https://github.com/developer-job-simulation/react-mui-table"
             >React Table</a
           >
         </div>
@@ -70,9 +116,15 @@ <h1>Browse Our Challenges</h1>
         <div id="signup-form">
           <h1>Sign Up & Get Started</h1>
           <form>
-            <span id="success-message" class="success-message" hidden="true">Success!</span>
-            <span id="taken-error-message" class="error-message" hidden="true">Error: Email Already Taken</span>
-            <span id="empty-error-message" class="error-message" hidden="true">Error: Email Address Empty.</span>
+            <span id="success-message" class="success-message" hidden="true"
+              >Success!</span
+            >
+            <span id="taken-error-message" class="error-message" hidden="true"
+              >Error: Email Already Taken</span
+            >
+            <span id="empty-error-message" class="error-message" hidden="true"
+              >Error: Email Address Empty.</span
+            >
             <input id="email" type="email" placeholder="Enter your email" />
             <button>Submit</button>
           </form>
diff --git a/src/script.js b/src/script.js
index 529f585..abb5991 100644
--- a/src/script.js
+++ b/src/script.js
@@ -24,15 +24,18 @@ addEventListener("submit", (event) => {
   resetMessage();
 
   let email = document.getElementById("email").value;
-
-  // TODO: Show Correct Status Messages on Signup Form
-  // 1. successful signup
-  // 2. empty email
-  // 3. taken email
-  // 4. repeat email
+  if (usersTable.map((users) => users.username).includes(email)) {
+    renderEmailTakenError();
+  } else if (email === "") {
+    renderEmailEmptyError();
+  } else {
+    usersTable.push({ username: email });
+    renderSuccess();
+  }
 });
 
 let toggleNav = () => {
+  console.log("click");
   var nav = document.getElementById("mobile-nav");
   if (nav.className.indexOf("show") == -1) {
     nav.className += " show";
diff --git a/src/styles.css b/src/styles.css
index 2cbb72e..c7c94fa 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -669,7 +669,7 @@ form > span {
 
 #jumbo-image {
   max-height: 20rem;
-  /* TODO: Invert banner colors using CSS */
+  filter: invert(1);
 }
 
 @media (max-width: 600px) {
@@ -725,7 +725,7 @@ form > span {
   }
 }
 @media (max-width: 992px) and (min-width: 601px) {
-  .hide-medium {
+  .hide-small {
     display: none !important;
   }
 }
@@ -876,8 +876,7 @@ form > span {
 
 #challenge-grid {
   display: grid;
-  /* TODO: Fix Issue, Tiles Need to be 2x2 Grid. Change only grid-template-columns */
-  grid-template-columns: none;
+  grid-template-columns: 1fr 1fr;
   grid-auto-rows: 10rem;
   gap: 1rem;
   padding-top: 2rem;
