diff --git a/source/webui/templates/navigation.tpl b/source/webui/templates/navigation.tpl
index 0b9d8a4..8e4a6d6 100644
--- a/source/webui/templates/navigation.tpl
+++ b/source/webui/templates/navigation.tpl
@@ -1,21 +1,21 @@
 <a class="brand" href="{$base_uri}home/">StatusBoard</a>
 
 <ul class="nav">
-{if $requested_page == home}
-<li class="active">
-{else}
-<li>
-{/if}
-<a href="{$base_uri}home/" title="Home">Home</a></li>
+    <li {if $requested_page == home}class="active"{/if}>
+        <a href="{$base_uri}home/" title="Home">Home</a>
+    </li>
     
     {if $authenticated}
         {if $auth->isAdministrator()}
-        {if $requested_page == admin}
-			<li class="active">
-			{else}
-			<li>
-			{/if}
-            <a href="{$base_uri}admin/" title="Admin">Admin</a></li>
+			<li class="dropdown {if $requested_page == admin}active{/if}" data-dropdown="dropdown">
+                <a href="{$base_uri}admin/" class="dropdown-toggle" title="Admin">Admin</a>
+                <ul class="dropdown-menu">
+                    <li><a href="{$base_uri}admin/tab/admin/" title="Admin">Admin</a></li>
+                    <li><a href="{$base_uri}admin/tab/services/" title="Manage Services">Services</a></li>
+                    <li><a href="{$base_uri}admin/tab/users/" title="Manage Users">Users</a></li>
+                    <li><a href="{$base_uri}admin/tab/settings/" title="Manage Settings">Settings</a></li>
+                </ul>
+            </li>
         {/if}
         <li><a href="{$base_uri}logout/" title="Logout">Logout</a></li>
     {else}