diff --git a/source/webui/pages/home.php b/source/webui/pages/home.php
index 7d6468e..2f3accf 100644
--- a/source/webui/pages/home.php
+++ b/source/webui/pages/home.php
@@ -2,6 +2,13 @@
 
 $services = StatusBoard_Service::all();
 
+for ($i = 1; $i <= 6; ++$i){
+    $day = 'day'.$i;
+    $date = date("M. d", strtotime("-{$i}day"));
+    
+    $this->smarty->assign($day, $date);
+}
+
 $this->smarty->assign('services', $services);
 
 ?>
\ No newline at end of file
diff --git a/source/webui/pages/navigation.php b/source/webui/pages/navigation.php
new file mode 100644
index 0000000..5d61883
--- /dev/null
+++ b/source/webui/pages/navigation.php
@@ -0,0 +1,18 @@
+<?php
+
+$display_login = true;
+$display_admin = false;
+
+$auth = StatusBoard_Main::instance()->auth();
+if ($auth->isAuthenticated()) {
+    $display_login = false;
+}
+
+if ($auth->isAdministrator()) {
+    $display_admin = true;
+}
+
+$this->smarty->assign('display_login', $display_login);
+$this->smarty->assign('display_admin', $display_admin);
+
+?>
\ No newline at end of file
diff --git a/source/webui/templates/home.tpl b/source/webui/templates/home.tpl
index b883b16..38f94b4 100644
--- a/source/webui/templates/home.tpl
+++ b/source/webui/templates/home.tpl
@@ -1,20 +1,45 @@
 <div id="statusboard">
-    {foreach from=$services item=service}
-        <div class="service">
-            {$service->name()}
-            {foreach from=$service->sites() item=site}
-                {assign var=incidents value=$site->openIncidents()}
-                <div class="site">
-                    {$site->name()} ({StatusBoard_Status::name($site->status())})
-                    {foreach from=$incidents item=incident}
-                        <div class="incident">
-                            {StatusBoard_Status::name($incident->currentStatus())}: {$incident->description()}
-                        </div>
-                    {/foreach}
-                </div>            
-            {foreachelse}
-            
+    <table class="bordered-table zebra-striped">
+        <thead>
+            <tr>
+                <th>Service</th>
+                <th class="status">Current</th>
+                <th class="status">{$day1}</th>
+                <th class="status">{$day2}</th>
+                <th class="status">{$day3}</th>
+                <th class="status">{$day4}</th>
+                <th class="status">{$day5}</th>
+                <th class="status">{$day6}</th>
+            </tr>
+        </thead>
+        <tbody>
+            {foreach from=$services item=service}
+                <tr colspan="8" class="service">
+                    <th>
+                        {$service->name}
+                    </th>
+                </tr>
+                {foreach from=$service->sites() item=site}
+                    {assign var=incidents value=$site->openIncidents()}
+                    <tr>
+                        <td>
+                            {$site->name}
+                        </td>
+                        <td>
+                            {StatusBoard_Status::name($site->status())}
+                        </td>
+                        <td>good</td>
+                        <td>good</td>
+                        <td>good</td>
+                        <td>good</td>
+                        <td>good</td>
+                        <td>good</td>                            
+                    </tr>            
+                {foreachelse}
+                
+                
+                {/foreach}    
             {/foreach}
-        </div>
-    {/foreach}
+        </tbody>
+    </table>
 </div>
diff --git a/source/webui/templates/index.tpl b/source/webui/templates/index.tpl
index 803279f..a168634 100644
--- a/source/webui/templates/index.tpl
+++ b/source/webui/templates/index.tpl
@@ -30,13 +30,13 @@
             </div>
 
             <div id="navigation">
-                {include file="navigation.tpl"}
+                {$page->include_template('navigation')}
             </div>
 
             <div id="page-container">
             
                 <div id="sidebar">
-                    {include file="sidebar.tpl"}
+                    {$page->include_template('sidebar')}
                 </div>
 
                 <div id="page">
diff --git a/source/webui/templates/navigation.tpl b/source/webui/templates/navigation.tpl
index 96cbfc9..031bb6b 100644
--- a/source/webui/templates/navigation.tpl
+++ b/source/webui/templates/navigation.tpl
@@ -1,4 +1,19 @@
-<ul>
-    <li><a href="{$base_uri}home/" title="Home">Home</a></li>
-    <li><a href="{$base_uri}admin/" title="Admin">Admin</a></li>
-</ul>
\ No newline at end of file
+<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 $display_admin}
+        <li><a href="{$base_uri}admin/" title="Admin">Admin</a></li>
+    {/if}
+
+    {if $display_login}
+        <li><a href="{$base_uri}login/" title="Login">Login</a></li>
+    {else}
+        <li><a href="{$base_uri}logout/" title="Logout">Logout</a></li>
+    {/if}
+</ul>
+
+<p class="pull-right">
+    Logged in as <a href="#">username</a>
+</p>
\ No newline at end of file