diff --git a/src/index.html b/src/index.html
index 04bd19e..7bc3290 100644
--- a/src/index.html
+++ b/src/index.html
@@ -23,15 +23,15 @@
           ><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 id="nav-logo" class="bar-item button padding-large white" href="#header">JobSimulator.Dev</a>
+        <a id="nav-challenges" class="bar-item button hide-small padding-large hover-white" href="#challenges">Browse Challenges</a>
+        <a id="nav-signup" class="bar-item button hide-small padding-large hover-white" href="#signup">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>
+        <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>
 
diff --git a/src/script.js b/src/script.js
index 529f585..c8ebccc 100644
--- a/src/script.js
+++ b/src/script.js
@@ -25,6 +25,20 @@ addEventListener("submit", (event) => {
 
   let email = document.getElementById("email").value;
 
+  if (email === '' || email === null || email === undefined) {
+    renderEmailEmptyError();
+    return;
+  }
+
+  let user = usersTable.find(user => user.username === email);
+  if (user) {
+    renderEmailTakenError();
+    return;
+  }
+
+  renderSuccess();
+  usersTable.push({username:email});
+
   // TODO: Show Correct Status Messages on Signup Form
   // 1. successful signup
   // 2. empty email
diff --git a/src/styles.css b/src/styles.css
index 2cbb72e..251a2e1 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -670,6 +670,7 @@ form > span {
 #jumbo-image {
   max-height: 20rem;
   /* TODO: Invert banner colors using CSS */
+  filter: invert(100%);
 }
 
 @media (max-width: 600px) {
@@ -877,7 +878,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;