diff --git a/templates/layouts/footer.html b/templates/layouts/footer.html
index 103aacf..16bbe51 100644
--- a/templates/layouts/footer.html
+++ b/templates/layouts/footer.html
@@ -10,6 +10,6 @@
         <li><a href="/">WXYZ</a></li>
     </ul>
     <p class="copyright">
-        <a href="/">©2022 Runnerspace.live All Rights Reserved.</a> | Served at {{ now().isoformat(sep=' ', timespec='milliseconds') }}
+        <a href="{{ url_for('main.index') }}">©2022 Runnerspace.live All Rights Reserved.</a> | {{ now().isoformat(sep=' ', timespec='milliseconds') }} UTC
     </p>
 </footer>
diff --git a/templates/layouts/header.html b/templates/layouts/header.html
index 93815f4..d8bdf1d 100644
--- a/templates/layouts/header.html
+++ b/templates/layouts/header.html
@@ -3,22 +3,22 @@
         <span id="logo">runnerspace</span>
         <div class="header-login">
             {% if current_user.is_authenticated %}
-            Logged in as <a href="/user/{{ current_user.username }}/" class="username">{{ current_user.username }}</a> | <a href="/logout">Logout</a>
+            Logged in as <a href="{{ url_for('main.user', username=current_user.username) }}" class="username">{{ current_user.username }}</a> | <a href="{{ url_for('main.logout') }}">Logout</a>
             {% else %}
-                <a href="/login">Login</a> or <a href="/signup">Sign-up</a>!
+                <a href="{{ url_for('main.login') }}">Login</a> or <a href="{{ url_for('main.signup') }}">Sign-up</a>!
             {% endif %}
         </div>
     </div>
     <nav class="header-secondary">
         <ul class="links">
-            <li><a href="/">Home</a></li>
-            <li><a href="/feed">My Feed</a></li>
-            <li><a href="/users">Browse</a></li>
-            <li><a href="/search">Search</a></li>
-            <li><a href="/messages">My Messages</a></li>
-            <li><a href="/blogs">Blog</a></li>
-            <li><a href="/groups">Groups</a></li>
-            <li><a href="/about">About</a></li>
+            <li><a href="{{ url_for('main.index') }}">Home</a></li>
+            <li><a href="{{ url_for('main.feed') }}">My Feed</a></li>
+            <li><a href="{{ url_for('main.browse') }}">Browse</a></li>
+            <li><a href="{{ url_for('main.search') }}">Search</a></li>
+            <li><a href="{{ url_for('main.messages') }}">My Messages</a></li>
+            <li><a href="{{ url_for('main.blogs') }}">Blog</a></li>
+            <li><a href="{{ url_for('main.groups') }}">Groups</a></li>
+            <li><a href="{{ url_for('main.about') }}">About</a></li>
         </ul>
     </nav>
 </div>
diff --git a/templates/layouts/index.html b/templates/layouts/index.html
index 47307ec..190318f 100644
--- a/templates/layouts/index.html
+++ b/templates/layouts/index.html
@@ -1,5 +1,10 @@
 {% extends 'layouts/base.html' %}
 
 {% block content %}
-    <div class="content-inner">Hello, World!</div>
+    <div class="content-inner">
+    <h4>New Users</h4>
+    <div>
+
+    </div>
+    </div>
 {% endblock %}
diff --git a/templates/pages/login.html b/templates/pages/login.html
index 14c0717..dda9d5b 100644
--- a/templates/pages/login.html
+++ b/templates/pages/login.html
@@ -31,7 +31,7 @@
             <button class="button">Login</button>
         </form>
         <p class="form-subtext">
-            Don't have a login? <a href="/signup">Sign-up</a> instead!
+            Don't have a login? <a href="{{ url_for('main.signup') }}">Sign-up</a> instead!
         </p>
     </div>
 {% endblock content %}
diff --git a/templates/pages/signup.html b/templates/pages/signup.html
index 2358cd6..a375783 100644
--- a/templates/pages/signup.html
+++ b/templates/pages/signup.html
@@ -34,7 +34,7 @@
         </form>
 
         <p class="form-subtext">
-            Already have a login? <a href="/login">Login</a> instead!
+            Already have a login? <a href="{{ url_for('main.login') }}">Login</a> instead!
         </p>
     </div>
 {% endblock content %}