diff --git a/layout.php b/layout.php
index a1ff871..1a07b63 100644
--- a/layout.php
+++ b/layout.php
@@ -32,13 +32,19 @@ else {
 
 		<nav> <!--TODO: Populate this list from the categories defined by the admins-->
 			<ul>
-				<li><a class="categoryLink" href="../index.php?pageHeading=Home+%26+Garden">Home &amp; Garden</a></li>
-				<li><a class="categoryLink" href="../index.php?pageHeading=Electronics">Electronics</a></li>
-				<li><a class="categoryLink" href="../index.php?pageHeading=Fashion">Fashion</a></li>
-				<li><a class="categoryLink" href="../index.php?pageHeading=Sport">Sport</a></li>
-				<li><a class="categoryLink" href="../index.php?pageHeading=Health">Health</a></li>
-				<li><a class="categoryLink" href="../index.php?pageHeading=Toys">Toys</a></li>
-				<li><a class="categoryLink" href="../index.php?pageHeading=Motors">Motors</a></li>
+				<?php
+					$server = 'mysql';
+					$username = 'student';
+					$password = 'student';
+					$schema = 'ibuy';
+					$pdo = new PDO('mysql:dbname=' . $schema . ';host=' . $server, $username, $password);
+					$stmt = $pdo->prepare('SELECT * FROM categories');
+					$stmt->execute();
+					$cats = $stmt->fetchAll();
+					foreach ($cats as &$cat) {
+						echo '<li><a class="categoryLink" href="../index.php?pageHeading='. urlencode($cat['category_name']) .'">'. $cat['category_name'] .'</a></li>';
+					}
+				?>
 				<li><a class="categoryLink" <?php echo $logButton?></a></li>
 			</ul>
 		</nav>
diff --git a/public/account/login.php b/public/account/login.php
index daeb564..66b2853 100644
--- a/public/account/login.php
+++ b/public/account/login.php
@@ -10,10 +10,10 @@ $pageContent = '<p>Don\'t have an account?<a href=\'register.php\'>Click here to
 $stylesheet = '../assets/ibuy.css';
 require '../../layout.php';
 $server = 'mysql';
-    $username = 'student';
-    $password = 'student';
-    $schema = 'ibuy';
-    $pdo = new PDO('mysql:dbname=' . $schema . ';host=' . $server, $username, $password);
+$username = 'student';
+$password = 'student';
+$schema = 'ibuy';
+$pdo = new PDO('mysql:dbname=' . $schema . ';host=' . $server, $username, $password);
 if (isset($_POST['submit'])) {
     $stmt = $pdo->prepare('SELECT * FROM users WHERE email = :email');
     $values = [