diff --git a/variable_grabbler.pass1.json b/variable_grabbler.pass1.json
index ca0f653..cce782a 100644
--- a/variable_grabbler.pass1.json
+++ b/variable_grabbler.pass1.json
@@ -1,4 +1,3 @@
 {
-"LOGIN_LINK":"<?php if (isset($_SESSION['user_id'])){ echo \"<a href=\\\"%CONTENT_DIR%/logout/\\\">Log out</a>\";} else { echo \"<a href=\\\"%CONTENT_DIR%/login/\\\">Log in</a>\";} ?>",
-"HOME_LINK":"<?php if (isset($_SESSION['user_id'])){ echo \"<a class=\\\"active\\\" href=\\\"/common/threadr/userhome/\\\"><img src=\\\"/common/threadr/img/ThreadR_Home.svg\\\" alt=\\\"My Feed\\\"/></a>\";} else { echo \"<a class=\\\"active\\\" href=\\\"/common/threadr/\\\"><img src=\\\"/common/threadr/img/ThreadR_Home.svg\\\" alt=\\\"Home\\\"/></a>\";} ?>"
+"NAVBAR":"<?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 />",
 }