diff --git a/source/webui/templates/fragments/site-status-details.tpl b/source/webui/templates/fragments/site-status-details.tpl
new file mode 100644
index 0000000..87ca176
--- /dev/null
+++ b/source/webui/templates/fragments/site-status-details.tpl
@@ -0,0 +1,10 @@
+{StatusBoard_Status::description($status)|escape:html}
+
+{if $incidents}
+    <dl>
+        {foreach from=$incidents item=incident}
+            <dt>{$incident->reference|escape:html} <em>({StatusBoard_Status::name($incident->currentStatus())})</em></dt>
+            <dd>{$incident->description|truncate|escape:html}</dd>
+        {/foreach}
+    </dl>
+{/if}
\ No newline at end of file
diff --git a/source/webui/templates/fragments/site-status.tpl b/source/webui/templates/fragments/site-status.tpl
new file mode 100644
index 0000000..46164c1
--- /dev/null
+++ b/source/webui/templates/fragments/site-status.tpl
@@ -0,0 +1,20 @@
+{switch $status}
+    {case StatusBoard_Status::STATUS_Resolved}
+        {assign var=img_src value="{$base_uri}images/Status_Icons/tick-circle.png"}
+    {/case}
+    {case StatusBoard_Status::STATUS_Maintenance}
+        {assign var=img_src value="{$base_uri}images/Status_Icons/traffic-cone.png"}
+    {/case}
+    {case StatusBoard_Status::STATUS_Minor}
+        {assign var=img_src value="{$base_uri}images/Status_Icons/exclamation.png"}
+    {/case}
+    {case StatusBoard_Status::STATUS_Significant}
+        {assign var=img_src value="{$base_uri}images/Status_Icons/exclamation.png"}
+    {/case}
+    {case StatusBoard_Status::STATUS_Major}
+        {assign var=img_src value="{$base_uri}images/Status_Icons/cross-circle.png"}
+    {/case}
+{/switch}
+<a href="{$base_uri}site/id/{$site->id}/{if $start}start/{$start}/{/if}{if $end}end/{$end}/{/if}" class="" rel="popover" data-content="{include file="fragments/site-status-details.tpl"}" data-original-title="{StatusBoard_Status::name($status)|escape:html}">
+    <img src="{$img_src}" />
+</a>
\ No newline at end of file
diff --git a/source/webui/templates/home.tpl b/source/webui/templates/home.tpl
index 08dd7c1..15d2187 100644
--- a/source/webui/templates/home.tpl
+++ b/source/webui/templates/home.tpl
@@ -3,7 +3,7 @@
         <thead>
             <tr>
                 <th>Service</th>
-                <th class="status">Current</th>
+                <th class="status">Now</th>
                 {foreach from=$days key="ind" item="day"}
   				    <th class="status">{$day}</th>
 				{/foreach}
@@ -17,34 +17,24 @@
                     </th>
                 </tr>
                 {foreach from=$service->sites() item=site}
-                {assign var=incidents value=$site->openIncidents()}
+                {$incidents=$site->openIncidents()}
                     <tr class="site">
                         <td>
                             {$site->name}
                         </td>
                         <td>
-                        <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
-                        </td>
-                        <td>
-                            TODO
-                        </td>
-                        <td>
-                            TODO
-                        </td>
-                        <td>
-                            TODO
-                        </td>
-                        <td>
-                            TODO
+                            {$status=$site->status()}
+                            {include nocache file="fragments/site-status.tpl" start=null end=null}
                         </td>
+                        {foreach from=array(1,2,3,4,5,6) item=day}
+                            {$start=mktime(0,0,0,date("n"),date("j")-$day-1)}
+                            {$end=mktime(0,0,0,date("n"),date("j")-$day)}
+                            {$incidents=$site->openIncidentsDuring($start, $end)}
+                            {$status=StatusBoard_Incident::highestSeverityStatus($incidents)}
+                            <td>
+                                {include nocache file="fragments/site-status.tpl" start=$start end=$end status=$status incidents=$incidents}
+                            </td>
+                        {/foreach}
                     </tr>
                 {/foreach}
             {/foreach}