diff --git a/db.php b/db.php
new file mode 100644
index 0000000..18fb409
--- /dev/null
+++ b/db.php
@@ -0,0 +1,13 @@
+<?php
+function fetchCats() {
+    $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();
+
+    return $cats;
+}
\ No newline at end of file
diff --git a/layout.php b/layout.php
index d03ccfc..ef0b60a 100644
--- a/layout.php
+++ b/layout.php
@@ -1,11 +1,12 @@
 <?php
-session_start();
 if (isset($_SESSION['loggedin'])) {
-	$logButton = 'href="account/logout.php">Logout';
+	$logButton = 'href="../account/logout.php">Logout';
 }
 else {
-	$logButton = 'href="account/login.php">Login';
+	$logButton = 'href="../account/login.php">Login';
 }
+
+require_once 'db.php';
 ?>
 
 <!DOCTYPE html>
@@ -33,14 +34,7 @@ else {
 		<nav> <!--TODO: Populate this list from the categories defined by the admins-->
 			<ul>
 				<?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();
+					$cats = fetchCats();
 					foreach ($cats as &$cat) {
 						echo '<li><a class="categoryLink" href="../index.php?pageHeading='. urlencode($cat['category_name']) .'">'. $cat['category_name'] .'</a></li>';
 					}
diff --git a/public/account/login.php b/public/account/login.php
index 031a3b4..8e4843f 100644
--- a/public/account/login.php
+++ b/public/account/login.php
@@ -1,10 +1,11 @@
 <?php
+session_start();
 $pageTitle = 'iBuy - Login';
 $pageContent = '<p>Don\'t have an account?<a href=\'register.php\'>Click here to register</a></p>
     <h1>Login</h1>
     <form action="login.php" method="POST">
     <label>Email</label> <input name="email" type="text" />
-    <label>Password</label> <input name="password" type="text" />
+    <label>Password</label> <input name="password" type="password" />
     <input name="submit" type="submit" value="Submit" />
     </form>';
 $stylesheet = '../assets/ibuy.css';
@@ -23,10 +24,11 @@ if (isset($_POST['submit'])) {
     $user = $stmt->fetch();
     if (password_verify($_POST['password'], $user['password'])) {
         $_SESSION['loggedin'] = $user['user_id'];
-        echo'<script>window.location.href = "../index.php";</script>';
         if ($user['admin'] === 'y') {
-            $_SESSION['loggedin'] = 'y';
+            $_SESSION['admin'] = 'y';
         }
+        echo'<script>window.location.href = "../index.php";</script>';
+        
     }
     else {
         echo '<p>Unsuccessful Login</p>';
diff --git a/public/account/logout.php b/public/account/logout.php
index af49c50..6d4ec10 100644
--- a/public/account/logout.php
+++ b/public/account/logout.php
@@ -1,6 +1,6 @@
 <?php
 session_start();
 unset($_SESSION['loggedin']);
-header('Location: ../index.php');
-echo '<p>Logged Out</p>';
+unset($_SESSION['admin']);
+echo'<script>window.location.href = "../index.php";</script>';
 ?>
\ No newline at end of file
diff --git a/public/admin/adminCategories.php b/public/admin/adminCategories.php
index e69de29..e0098eb 100644
--- a/public/admin/adminCategories.php
+++ b/public/admin/adminCategories.php
@@ -0,0 +1,28 @@
+<?php
+session_start();
+$pageTitle = 'iBuy - Admin';
+$stylesheet = '../assets/ibuy.css';
+if(isset($_SESSION['admin'])) {
+    if($_SESSION['admin'] != 'y') {
+        //echo'<script>window.location.href = "../index.php";</script>';
+    }
+}
+else {
+    //echo'<script>window.location.href = "../index.php";</script>';
+}
+
+require_once '../../db.php';
+$pageContent = '<h1>Categories  <a href="addCategory.php">Add</a></h1> 
+<ul>'. populateContent() .'</ul>';
+
+require '../../layout.php';
+
+function populateContent() {
+    $output = '';
+	$cats = fetchCats();
+    foreach ($cats as &$cat) {
+        $output .= '<li>'. $cat['category_name'] . ' <a href="editCategory.php?category_id='. urlencode($cat['category_id']) .'">edit</a> <a href="deleteCategory.php?category_id='. urlencode($cat['category_id']). '">delete</a></li>';
+    }
+    return $output;
+}
+?>
\ No newline at end of file
diff --git a/public/index.php b/public/index.php
index 6bdd75b..88e59d8 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,4 +1,5 @@
 <?php
+session_start();
 //Listing display page. Display the 10 auctions finishing soonest
 //Can be used for index, search page, and category listing
 $pageTitle = 'iBuy - Home';
