diff --git a/source/webui/templates/admin/site.tpl b/source/webui/templates/admin/site.tpl
index 214c15b..f35796d 100644
--- a/source/webui/templates/admin/site.tpl
+++ b/source/webui/templates/admin/site.tpl
@@ -69,7 +69,7 @@
                                 {StatusBoard_Status::name($incident->currentStatus())}
                                 </td>
                                 <td>
-                                    <button class='btn small primary' onclick="document.location.href='{$base_uri}admin/site/service/{$service->id}/id/{$site->id}/';return false;">Edit</button>
+                                    <button class='btn small primary' onclick="document.location.href='{$base_uri}admin/incident/service/{$service->id}/site/{$site->id}/id/{$incident->id}/';return false;">Edit</button>
                                     <button style="margin-left:10px" class='btn small danger' onclick="sb.admin.deleteItem('{$base_uri}admin/service/do/delete-site/id/{$service->id}/site/{$site->id}/');">Delete</button>
                                 </td>
                             </tr>
@@ -82,64 +82,16 @@
         </div>
     </div><!--/Row for Existing Service-->
 
-<div class="row">
+    <div class="row">
 		<div class="span4 column">
             <h3>Add Incident</h3>
-            <p>Use this form to add a new incident</p>
+            <p>
+                Click the button to open the Add Incident page.
+            </p>
         </div><!--/New Service description-->
+        
         <div class="span11 column">
-		
-		<form id="admin_addsite" method="post" action="{$base_uri}admin/site/service/{$service->id}/id/{$site->id}/do/add-incident/">
-		    <fieldset>
-		        <div class="clearfix">
-		            <label for="admin_incident_add_reference">Reference</label>
-		            <div class="text">
-		                <input class="xlarge span5" id="admin_incident_add_reference" name="reference" type="text" value="" />
-		            </div>
-		        </div><!-- /clearfix -->
-		        
-		        <div class="clearfix">
-		            <label for="admin_incident_add_description">Description</label>
-		            <div class="text">
-		                <textarea class="xlarge" id="admin_incident_add_description" name="description"></textarea>
-		            </div>
-		        </div><!-- /clearfix -->
-		        
-		        <div class="clearfix">
-		            <label for="admin_incident_add_status">Initial Classification</label>
-		            <div class="select">
-		                <select class="xlarge span5" id="admin_incident_add_status" name="status">
-		                    {foreach from=StatusBoard_Status::available() item=status}
-		                        {if $status != StatusBoard_Status::STATUS_Resolved}
-		                            <option value="{$status}">{StatusBoard_Status::name($status)}</option>
-		                        {/if}
-		                    {/foreach}
-		                </select>
-		            </div>
-		        </div><!-- /clearfix -->
-		        
-		        <div class="clearfix">
-		            <label for="admin_incident_add_starttime">Start Time</label>
-		            <div class="text">
-		                <input class="xlarge span5" id="admin_incident_add_starttime" name="starttime" type="text" value="Now" />
-		            </div>
-		        </div><!-- /clearfix -->
-		        
-		        <div class="clearfix">
-		            <label for="admin_incident_add_estimatedendtime">Estimated End Time</label>
-		            <div class="text">
-		                <input class="xlarge span5" id="admin_incident_add_estimatedendtime" name="estimatedendtime" type="text" value="+4 hours" />
-		            </div>
-		        </div><!-- /clearfix -->
-		                    
-		        <div class="clearfix">
-		            <div class="input">
-		                <input type="submit" class="btn small primary" name="addincident" value="Add Incident" />
-		            </div>
-		        </div>
-    		</fieldset>
-		</form>
-
- 		</div><!--/Row for New Service-->  
+            <button class="btn small primary" onclick="location.href='{$base_uri}admin/add-incident/service/{$service->id}/site/{$site->id}/'">Add Incident</button>
+        </div>          
 	</div>
 </div><!-- /container -->
\ No newline at end of file