diff --git a/navbar.php b/navbar.php
index b7363df..35a0e68 100644
--- a/navbar.php
+++ b/navbar.php
@@ -1 +1,80 @@
-<?php
if (isset($_SESSION['user_id'])){
  $login = true;
} else {
  $login = false;
}
?>

<ul class="topnav">
  <li>
    <?php
    if ($login){
      if ($navbar == "home"){
        echo "<a class=\"active\" href=\"%CONTENT_DIR%/userhome/\"><img src=\"/common/threadr/img/ThreadR_Home.svg\" alt=\"My Feed\"/></a>";
      } else {
        echo "<a href=\"%CONTENT_DIR%/userhome/\"><img src=\"/common/threadr/img/ThreadR_Home.svg\" alt=\"My Feed\"/></a>";
      }
    } else {
      if ($navbar == "home"){
        echo "<a class=\"active\" href=\"%CONTENT_DIR%/\"><img src=\"/common/threadr/img/ThreadR_Home.svg\" alt=\"Home\"/></a>";
      } else {
        echo "<a href=\"%CONTENT_DIR%/\"><img src=\"/common/threadr/img/ThreadR_Home.svg\" alt=\"Home\"/></a>";
      }
    }
    ?>
    </li>
        <li>
    <?php
    if ($navbar == "news"){
      echo "<a class=\"active\" href=\"%CONTENT_DIR%/news/\">News</a>";
    } else {
      echo "<a href=\"%CONTENT_DIR%/news/\">News</a>";
    }
    ?>
  </li>
  <div class="dropdown">
    <button class="dropbtn">Boards</button>
    <div class="dropdown-content">
      <a href="%CONTENT_DIR%/boards/">Board 1</a>
      <a href="#">Board 2</a>
      <a href="#">Board 3</a>
    </div>
  </div>
  <li>
    <?php
    if ($navbar == "about"){
      echo "<a class=\"active\" href=\"%CONTENT_DIR%/about/\">About</a>";
    } else {
      echo "<a href=\"%CONTENT_DIR%/about/\">About</a>";
    }
    ?>
  </li>
  <li class="right">
    <?php
    if ($login) {
      if ($navbar == "profile") {
        echo "<a class=\"active\" href=\"%CONTENT_DIR%/profile/\">Profile</a>";
      } else {
        echo "<a href=\"%CONTENT_DIR%/profile/\">Profile</a>";
      }
    }
    ?>
  </li>
  <li class="right">
    <?php
    if ($login) {
      echo "<a href=\"%CONTENT_DIR%/logout/\">Log out</a>";
    } else {
      if ($navbar == "login") {
        echo "<a class=\"active\" href=\"%CONTENT_DIR%/login/\">Log in</a>";
      } else {
        echo "<a href=\"%CONTENT_DIR%/login/\">Log in</a>";
      }
    }
    ?>
  </li>
</ul>
<br />

\ No newline at end of file
+<?php
+  if (isset($_SESSION['user_id'])){
+    $login = true;
+  } else {
+    $login = false;
+  }
+?>
+
+<ul class="topnav">
+  <li>
+    <?php
+      if ($login){
+        if ($navbar == "home"){
+          echo "<a class=\"active\" href=\"%CONTENT_DIR%/userhome/\"><img src=\"/common/threadr/img/ThreadR_Home.svg\" alt=\"My Feed\"/></a>";
+        } else {
+          echo "<a href=\"%CONTENT_DIR%/userhome/\"><img src=\"/common/threadr/img/ThreadR_Home.svg\" alt=\"My Feed\"/></a>";
+        }
+      } else {
+        if ($navbar == "home"){
+          echo "<a class=\"active\" href=\"%CONTENT_DIR%/\"><img src=\"/common/threadr/img/ThreadR_Home.svg\" alt=\"Home\"/></a>";
+        } else {
+          echo "<a href=\"%CONTENT_DIR%/\"><img src=\"/common/threadr/img/ThreadR_Home.svg\" alt=\"Home\"/></a>";
+        }
+      }
+    ?>
+  </li>
+  <li>
+    <?php
+      if ($navbar == "news"){
+        echo "<a class=\"active\" href=\"%CONTENT_DIR%/news/\">News</a>";
+      } else {
+        echo "<a href=\"%CONTENT_DIR%/news/\">News</a>";
+      }
+    ?>
+  </li>
+  <li>
+    <?php
+      if ($navbar == "boards"){
+        echo "<a class=\"active\" href=\"%CONTENT_DIR%/boards/\">Boards</a>";
+      } else {
+        echo "<a href=\"%CONTENT_DIR%/boards/\">Boards</a>";
+      }
+    ?>
+  </li>
+  <li>
+    <?php
+      if ($navbar == "about"){
+        echo "<a class=\"active\" href=\"%CONTENT_DIR%/about/\">About</a>";
+      } else {
+        echo "<a href=\"%CONTENT_DIR%/about/\">About</a>";
+      }
+    ?>
+  </li>
+  <li class="right">
+    <?php
+      if ($login) {
+        if ($navbar == "profile") {
+          echo "<a class=\"active\" href=\"%CONTENT_DIR%/profile/\">Profile</a>";
+        } else {
+          echo "<a href=\"%CONTENT_DIR%/profile/\">Profile</a>";
+        }
+      }
+    ?>
+  </li>
+  <li class="right">
+    <?php
+      if ($login) {
+        echo "<a href=\"%CONTENT_DIR%/logout/\">Log out</a>";
+      } else {
+        if ($navbar == "login") {
+          echo "<a class=\"active\" href=\"%CONTENT_DIR%/login/\">Log in</a>";
+        } else {
+          echo "<a href=\"%CONTENT_DIR%/login/\">Log in</a>";
+        }
+      }
+    ?>
+  </li>
+</ul>
+
+<br /> 
\ No newline at end of file