diff --git a/source/webui/templates/admin.tpl b/source/webui/templates/admin.tpl
index e42a52a..0999824 100644
--- a/source/webui/templates/admin.tpl
+++ b/source/webui/templates/admin.tpl
@@ -41,7 +41,7 @@
                                     {$service->description|escape:html}
                                 </td>
                                 <td>
-                                    <button class='btn info' onclick="document.location.href='{$base_uri}admin/service/id/{$service->id}/';return false;">Edit</button>
+                                    <button class='btn primary' onclick="document.location.href='{$base_uri}admin/service/id/{$service->id}/';return false;">Edit Service</button>
                                     <button class='btn danger' onclick="sb.admin.deleteItem('{$base_uri}admin/tab/services/do/delete-service/id/{$service->id}/');">Delete</button>
                                 </td>
                             </tr>
diff --git a/source/webui/templates/admin/service.tpl b/source/webui/templates/admin/service.tpl
index c03727b..b629c93 100644
--- a/source/webui/templates/admin/service.tpl
+++ b/source/webui/templates/admin/service.tpl
@@ -64,8 +64,8 @@
                                     {$site->description|escape:html}
                                 </td>
                                 <td>
-                                    <button class='btn info' onclick="document.location.href='{$base_uri}admin/site/service/{$service->id}/id/{$site->id}/';return false;">Edit</button>
-                                    <button style="margin-left:10px" class='btn danger' onclick="sb.admin.deleteItem('{$base_uri}admin/service/do/delete-site/id/{$service->id}/site/{$site->id}/');">Delete</button>
+                                    <button class='btn primary' onclick="document.location.href='{$base_uri}admin/site/service/{$service->id}/id/{$site->id}/';return false;">Edit Site</button>
+                                    <button style="margin-left:10px" class='btn danger' onclick="sb.admin.deleteItem('{$base_uri}admin/service/do/delete-site/id/{$service->id}/site/{$site->id}/');">Delete Site</button>
                                 </td>
                             </tr>
                         {/foreach}
diff --git a/source/webui/templates/status.tpl b/source/webui/templates/status.tpl
index 4134ed4..9c406f0 100644
--- a/source/webui/templates/status.tpl
+++ b/source/webui/templates/status.tpl
@@ -8,7 +8,6 @@
 		         	<div class="row" name="edit service">
 		            	<div class="span4 column"><!--New description-->
 		                	<h3 class="status">Today {mktime(0,0,0,date("n"),date("j"))|date_format:"d M Y"}</h3>
-		                    <p>x incidents</p>
 		                </div>
 			            <div class="span12 column">
 			            	{$start=mktime(0,0,0,date("n"),date("j")-$day)}
@@ -49,7 +48,6 @@
   				    <div class="row" name="edit service">
   				    	<div class="span4 column"><!--New description-->
                         	<h3 class="status">{mktime(0,0,0,date("n"),date("j")-$day)|date_format:"d M Y"}</h3>
-                        	<p>x incidents</p>
                         </div>
 						<div class="span12 column">
             				{$start=mktime(0,0,0,date("n"),date("j")-$day)}