diff --git a/html/skins/local/screen.css b/html/skins/local/screen.css
index e69de29..dfef7a0 100644
--- a/html/skins/local/screen.css
+++ b/html/skins/local/screen.css
@@ -0,0 +1,7 @@
+#banner .loginForm { position:absolute; top:5px; right:5px; color:white; }
+#banner .loginForm h1 { display:none; }
+#banner .loginForm th label { color:white; }
+#banner .loginForm fieldset { border:none; margin:0; padding:0; }
+#banner .loginForm legend { display:none; }
+#banner .loginForm button {display:inline; }
+#banner .loginForm a { font-weight:bold; color:blue; }
diff --git a/templates/html/full-width.inc b/templates/html/full-width.inc
index 174bc2f..ccc7e5b 100644
--- a/templates/html/full-width.inc
+++ b/templates/html/full-width.inc
@@ -9,7 +9,9 @@
 <body>
 	<?php
 		include $dir.'/partials/banner.inc';
-		include $dir.'/partials/menubar.inc';
+		if (isset($_SESSION['USER'])) {
+			include $dir.'/partials/menubar.inc';
+		}
 	?>
 
 	<div id="panel-container">
diff --git a/templates/html/partials/banner.inc b/templates/html/partials/banner.inc
index e94ff3b..d099e14 100644
--- a/templates/html/partials/banner.inc
+++ b/templates/html/partials/banner.inc
@@ -3,4 +3,14 @@
 	<div id="location_name">
 		<a href="<?php echo BASE_URL; ?>">City of Bloomington, Mark Kruzan, Mayor</a>
 	</div>
+	<div class="loginForm">
+		<?php
+			if (isset($_SESSION['USER'])) {
+				echo "<a href=\"".BASE_URL."/login/logout.php\">Logout</a>";
+			}
+			else {
+				include APPLICATION_HOME.'/blocks/html/loginForm.inc';
+			}
+		?>
+	</div>
 </div>
diff --git a/templates/html/partials/menubar.inc b/templates/html/partials/menubar.inc
index 616169a..be2f87c 100644
--- a/templates/html/partials/menubar.inc
+++ b/templates/html/partials/menubar.inc
@@ -1,12 +1,17 @@
 <div class="menuBar">
-	<ul><li><a href="<?php echo BASE_URL; ?>">Home</a></li>
-		<?php
-			if (isset($_SESSION['USER'])) {
-				echo "<li><a href=\"".BASE_URL."/login/logout.php\">Logout</a></li>";
-			}
-			else {
-				echo "<li><a href=\"".BASE_URL."/login\">Login</a></li>";
-			}
-		?>
-	</ul>
+	<ul><li><a href="<?php echo BASE_URL; ?>">Internments</a></li>
+	<?php
+		if (userIsAllowed('Cemeteries')) {
+			echo "<li><a href=\"".BASE_URL."/cemeteries\">Cemeteries</a></li>";
+		}
+		if (userIsAllowed('Deeds')) {
+			echo "<li><a href=\"".BASE_URL."/deeds\">Deeds</a></li>";
+		}
+		if (userIsAllowed('Users')) {
+			echo "
+			<li><a href=\"".BASE_URL."/people\">People</a></li>
+			<li><a href=\"".BASE_URL."/users\">Users</a></li>
+			";
+		}
+	?>
 </div>
diff --git a/templates/html/partials/panel-one.inc b/templates/html/partials/panel-one.inc
index 07876fe..ed6c9b1 100644
--- a/templates/html/partials/panel-one.inc
+++ b/templates/html/partials/panel-one.inc
@@ -1,11 +1,5 @@
 <div id="panel-one">
-	<ul><li><a href="<?php echo BASE_URL; ?>/cemeteries">Cemeteries</a></li>
-		<li><a href="<?php echo BASE_URL; ?>/deeds">Deeds</a></li>
-		<li><a href="<?php echo BASE_URL; ?>/internments">Internments</a></li>
-	</ul>
-	<?php
-		if (userIsAllowed('Users')) {
-			include APPLICATION_HOME.'/templates/html/partials/panel-widgets/Users.inc';
-		}
-	?>
+<?php
+	echo $this->includeBlocks('panel-one');
+?>
 </div>
diff --git a/templates/html/partials/panel-two.inc b/templates/html/partials/panel-two.inc
index 64c0d9f..5214323 100644
--- a/templates/html/partials/panel-two.inc
+++ b/templates/html/partials/panel-two.inc
@@ -1,2 +1,5 @@
 <div id="panel-two">
+<?php
+	echo $this->includeBlocks('panel-two');
+?>
 </div>
diff --git a/templates/html/partials/panel-widgets/Users.inc b/templates/html/partials/panel-widgets/Users.inc
deleted file mode 100644
index b5825f3..0000000
--- a/templates/html/partials/panel-widgets/Users.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-	<h1>Admin</h1>
-	<ul>
-		<li><a href="<?php echo BASE_URL; ?>/people">People</a></li>
-		<li><a href="<?php echo BASE_URL; ?>/users">User Accounts</a></li>
-	</ul>
-</div>
diff --git a/templates/html/three-column.inc b/templates/html/three-column.inc
index 03873fc..15af82a 100644
--- a/templates/html/three-column.inc
+++ b/templates/html/three-column.inc
@@ -9,7 +9,9 @@
 <body>
 	<?php
 		include $dir.'/partials/banner.inc';
-		include $dir.'/partials/menubar.inc';
+		if (isset($_SESSION['USER'])) {
+			include $dir.'/partials/menubar.inc';
+		}
 	?>
 
 	<div id="panel-container">
diff --git a/templates/html/two-column.inc b/templates/html/two-column.inc
index d3ff663..f76ce4d 100644
--- a/templates/html/two-column.inc
+++ b/templates/html/two-column.inc
@@ -9,7 +9,9 @@
 <body>
 	<?php
 		include $dir.'/partials/banner.inc';
-		include $dir.'/partials/menubar.inc';
+		if (isset($_SESSION['USER'])) {
+			include $dir.'/partials/menubar.inc';
+		}
 	?>
 
 	<div id="panel-container">
