diff --git a/templates/category.html.php b/templates/category.html.php
new file mode 100644
index 0000000..b006e66
--- /dev/null
+++ b/templates/category.html.php
@@ -0,0 +1,14 @@
+<main class = "sidebar">
+    <section class="left">
+        <ul>
+            <?php require 'nav.html.php';?>
+        </ul>
+    </section>
+
+    <section class="right">
+        <h1> <?=$heading?> Jobs</h1>
+        <ul class="listing">
+            <?php require 'job.html.php';?>
+        </ul>
+    </section>
+</main>
\ No newline at end of file
diff --git a/templates/home.html.php b/templates/home.html.php
index af8d1b7..9f53927 100644
--- a/templates/home.html.php
+++ b/templates/home.html.php
@@ -1,7 +1,7 @@
-<p>Welcome to Jo's Jobs, we're a recruitment agency based in Northampton. We offer a range of different office jobs. Get in touch if you'd like to list a job with us.</a></p>
-<h2>Select the type of job you are looking for:</h2>
-<ul>
-	<li><a href="?page=it">IT</a></li>
-	<li><a href="?page=hr">Human Resources</a></li>
-	<li><a href="?page=sales">Sales</a></li>
-</ul>
\ No newline at end of file
+<main class="home">
+	<p>Welcome to Jo's Jobs, we're a recruitment agency based in Northampton. We offer a range of different office jobs. Get in touch if you'd like to list a job with us.</a></p>
+	<h2>Select the type of job you are looking for:</h2>
+	<ul>
+		<?php require 'nav.html.php';?>
+	</ul>
+</main>
\ No newline at end of file
diff --git a/templates/job.html.php b/templates/job.html.php
new file mode 100644
index 0000000..ba3691e
--- /dev/null
+++ b/templates/job.html.php
@@ -0,0 +1,12 @@
+<ul>
+<?php foreach ($jobs as $job) { ?>
+    <li>
+        <div class="details">
+            <h2><?=$job->title?></h2>
+            <h3><?=$job->salary?></h2>
+            <p><?=nl2br($job->description)?></p>
+            <a class="more" href="/apply.php">Apply for this job</a>
+        </div>
+    </li>
+<?php } ?>
+</ul>
\ No newline at end of file
diff --git a/templates/layout.html.php b/templates/layout.html.php
index c52c243..41a6817 100644
--- a/templates/layout.html.php
+++ b/templates/layout.html.php
@@ -21,18 +21,14 @@
                 <li><a href="/">Home</a></li>
                 <li>Jobs
                     <ul>
-                        <li><a href="?page=it">IT</a></li>
-                        <li><a href="?page=hr">Human Resources</a></li>
-                        <li><a href="?page=sales">Sales</a></li>
+                        <?php require 'nav.html.php'?>
                     </ul>
                 </li>
                 <li><a href="?page=about">About Us</a></li>
             </ul>
         </nav>
         <img src="../images/randombanner.php"/>
-        <main class="home">
             <?=$content;?>
-        </main>
         <footer>
             &copy; Jo's Jobs <?=date('Y');?>
         </footer>
diff --git a/templates/nav.html.php b/templates/nav.html.php
new file mode 100644
index 0000000..27b920f
--- /dev/null
+++ b/templates/nav.html.php
@@ -0,0 +1,5 @@
+<?php foreach($cats as $cat) { ?>
+    <li>
+        <a href="/jobs/category?page=<?=urlencode($cat->name)?>"><?=$cat->name?></a>
+    </li>
+<?php } ?>
\ No newline at end of file
diff --git a/templates/notFound.html.php b/templates/notFound.html.php
new file mode 100644
index 0000000..ecc6c37
--- /dev/null
+++ b/templates/notFound.html.php
@@ -0,0 +1,3 @@
+<main class="home">
+    <P>The page you have requested has not been found</p>
+</main>
\ No newline at end of file