diff --git a/CSY2028/EntryPoint.php b/CSY2028/EntryPoint.php
index ef2c359..98e570b 100644
--- a/CSY2028/EntryPoint.php
+++ b/CSY2028/EntryPoint.php
@@ -32,6 +32,7 @@ class EntryPoint {
 
         $page = $this->routes->getController($controllerName)->$functionName();
         $content = $this->loadTemplate('../templates/' . $page['template'], $page['vars']);
+        $nav = $this->loadTemplate('../templates/nav.html.php', $page['vars']);
         $title = $page['title'];
         require '../templates/layout.html.php';
     }
diff --git a/templates/layout.html.php b/templates/layout.html.php
index 41a6817..d07ee39 100644
--- a/templates/layout.html.php
+++ b/templates/layout.html.php
@@ -21,10 +21,10 @@
                 <li><a href="/">Home</a></li>
                 <li>Jobs
                     <ul>
-                        <?php require 'nav.html.php'?>
+                        <?=$nav?>
                     </ul>
                 </li>
-                <li><a href="?page=about">About Us</a></li>
+                <li><a href="/jobs/about">About Us</a></li>
             </ul>
         </nav>
         <img src="../images/randombanner.php"/>