diff --git a/source/webui/pages/home.php b/source/webui/pages/home.php
index 2e190c6..745c8fa 100644
--- a/source/webui/pages/home.php
+++ b/source/webui/pages/home.php
@@ -7,5 +7,6 @@ for ($i = 1; $i <= 6; ++$i){
 }
 $this->smarty->assign('days', $tbl_header_date);
 $this->smarty->assign('services', $services);
+$this->smarty->assign('requested_page', $this->page);
 
 ?>
\ No newline at end of file
diff --git a/source/webui/pages/navigation.php b/source/webui/pages/navigation.php
index 7a7cbf6..a2c3dc4 100644
--- a/source/webui/pages/navigation.php
+++ b/source/webui/pages/navigation.php
@@ -12,5 +12,4 @@ if ($auth->isAuthenticated()) {
 $this->smarty->assign('authenticated', $authenticated);
 $this->smarty->assign('auth', $auth);
 $this->smarty->assign('user', $user);
-
 ?>
\ No newline at end of file
diff --git a/source/webui/pages/usercp.php b/source/webui/pages/usercp.php
index 25a4cf7..55826b4 100644
--- a/source/webui/pages/usercp.php
+++ b/source/webui/pages/usercp.php
@@ -43,5 +43,6 @@ if ($request->exists('do')) {
 $this->smarty->assign('activity', $activity);
 $this->smarty->assign('successes', $successes);
 $this->smarty->assign('errors', $errors);
+$this->smarty->assign('requested_page', $this->page);
 
 ?>
\ No newline at end of file
diff --git a/source/webui/templates/home.tpl b/source/webui/templates/home.tpl
index f2297d4..08dd7c1 100644
--- a/source/webui/templates/home.tpl
+++ b/source/webui/templates/home.tpl
@@ -23,10 +23,12 @@
                             {$site->name}
                         </td>
                         <td>
-                        <a href="#" class="" rel="popover" data-content="{StatusBoard_Status::name($site->status())}" data-original-title="No Issues"><img src={$base_uri}images/Status_Icons/tick-circle.png></img></a>
+                        <a href="#" class="" rel="popover" data-content="{StatusBoard_Status::description($site->status())}" data-original-title="{StatusBoard_Status::name($site->status())}"><img src={$base_uri}images/Status_Icons/tick-circle.png></img></a>
                         </td>                                        
                         <td>
+                        <!-- example, remove when dynamically generated -->
                         <a href="#" class="" rel="popover" data-content="Brief disruption to service due to supplier fault" data-original-title="Incident:123456"><img src={$base_uri}images/Status_Icons/exclamation.png></img></a>
+                        <!-- /example, remove when dynamically generated -->
                         </td>
                         <td>
                             TODO
diff --git a/source/webui/templates/navigation.tpl b/source/webui/templates/navigation.tpl
index d5eb43a..0b9d8a4 100644
--- a/source/webui/templates/navigation.tpl
+++ b/source/webui/templates/navigation.tpl
@@ -1,11 +1,21 @@
 <a class="brand" href="{$base_uri}home/">StatusBoard</a>
 
 <ul class="nav">
-    <li class="active"><a href="{$base_uri}home/" title="Home">Home</a></li>
+{if $requested_page == home}
+<li class="active">
+{else}
+<li>
+{/if}
+<a href="{$base_uri}home/" title="Home">Home</a></li>
     
     {if $authenticated}
         {if $auth->isAdministrator()}
-            <li><a href="{$base_uri}admin/" title="Admin">Admin</a></li>
+        {if $requested_page == admin}
+			<li class="active">
+			{else}
+			<li>
+			{/if}
+            <a href="{$base_uri}admin/" title="Admin">Admin</a></li>
         {/if}
         <li><a href="{$base_uri}logout/" title="Logout">Logout</a></li>
     {else}