diff --git a/assets/templates/asset_audit.html b/assets/templates/asset_audit.html
index 26f426a0..21612fef 100644
--- a/assets/templates/asset_audit.html
+++ b/assets/templates/asset_audit.html
@@ -3,60 +3,113 @@
 {% block title %}Audit Asset {{ object.asset_id }}{% endblock %}
 
 {% block content %}
-<form class="form-horizontal" method="post" id="asset_update_form" action="{{ form.action|default:request.path }}">
-    {% include 'form_errors.html' %}
-    {% csrf_token %}
-    <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
-    <div class="col-sm-12">
-      <div class="form-group">
-        <label for="{{ form.asset_id.id_for_label }}" class="col-sm-2 control-label">Asset ID</label>
-        <div class="col-sm-10">
-            {% render_field form.asset_id|add_class:'form-control' value=object.asset_id %}
-        </div>
+<script>
+  function checkIfCableHidden() {
+    if (document.getElementById("id_is_cable").checked) {
+      document.getElementById("cable-table").hidden = false;
+    } else {
+      document.getElementById("cable-table").hidden = true;
+    }
+  }
+  checkIfCableHidden();
+</script>
+<form class="form-horizontal" method="POST" id="asset_audit_form" action="{{ form.action|default:request.path }}">
+  {% include 'form_errors.html' %}
+  {% csrf_token %}
+  <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
+  <div class="form-group">
+    <label for="{{ form.asset_id.id_for_label }}" class="col-sm-2 control-label">Asset ID</label>
+    <div class="col-sm-10">
+      {% render_field form.asset_id|add_class:'form-control' value=object.asset_idz %}
+    </div>
+  </div>
+  <div class="form-group">
+    <label for="{{ form.description.id_for_label }}" class="col-sm-2 control-label">Description</label>
+    <div class="col-sm-10">
+      {% render_field form.description|add_class:'form-control' value=object.description %}
+    </div>
+  </div>
+  <div class="form-group">
+    <label for="{{ form.category.id_for_label }}" class="col-sm-2 control-label">Category</label>
+    <div class="col-sm-10">
+      {% render_field form.category|add_class:'form-control'%}
+    </div>
+  </div>
+  <div class="form-group">
+    <label for="{{ form.status.id_for_label }}" class="col-sm-2 control-label">Status</label>
+    <div class="col-sm-10">
+      {% render_field form.status|add_class:'form-control'%}
+    </div>
+  </div>
+  <div class="form-group">
+    <label for="{{ form.serial_number.id_for_label }}" class="col-sm-2 control-label">Serial Number</label>
+    <div class="col-sm-10">
+      {% render_field form.serial_number|add_class:'form-control' value=object.serial_number %}
+    </div>
+  </div>
+  <div class="form-group">
+    <label for="{{ form.date_acquired.id_for_label }}" class="col-sm-2 control-label">Date Acquired</label>
+    <div class="col-sm-10">
+      {% render_field form.date_acquired|add_class:'form-control' value=object.date_acquired %}
+    </div>
+    <!--- TODO Add buttons for 'today' and 'unknown' (sets to beginning of time)--->
+  </div>
+  <hr>
+  <div class="form-group">
+    <label for="{{ form.is_cable.id_for_label }}" class="col-sm-2 control-label">Cable?</label>
+    <div class="col-sm-10">
+      {% render_field form.is_cable|attr:'onchange=checkIfCableHidden()' %}
+    </div>
+  </div>
+  <div id="cable-table">
+    <div class="form-group">
+      <label for="{{ form.plug.id_for_label }}" class="col-sm-2 control-label">Plug</label>
+      <div class="col-sm-10">
+        {% render_field form.plug|add_class:'form-control'%}
+      </div>
     </div>
     <div class="form-group">
-        <label for="{{ form.description.id_for_label }}" class="col-sm-2 control-label">Description</label>
-        <div class="col-sm-10">
-            {% render_field form.description|add_class:'form-control' value=object.description %}
-        </div>
+      <label for="{{ form.socket.id_for_label }}" class="col-sm-2 control-label">Socket</label>
+      <div class="col-sm-10">
+        {% render_field form.socket|add_class:'form-control'%}
+      </div>
     </div>
     <div class="form-group">
-        <label for="{{ form.category.id_for_label }}" class="col-sm-2 control-label">Category</label>
-        <div class="col-sm-10">
-            {% render_field form.category|add_class:'form-control'%}
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="{{ form.status.id_for_label }}" class="col-sm-2 control-label">Status</label>
-        <div class="col-sm-10">
-            {% render_field form.status|add_class:'form-control'%}
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="{{ form.serial_number.id_for_label }}" class="col-sm-2 control-label">Serial Number</label>
-        <div class="col-sm-10">
-            {% render_field form.serial_number|add_class:'form-control' value=object.serial_number %}
-        </div>
-    </div>
-    <div class="form-group">
-        <label for="{{ form.date_acquired.id_for_label }}" class="col-sm-2 control-label">Date Acquired</label>
-        <div class="col-sm-10">
-            {% render_field form.date_acquired|add_class:'form-control' value=object.date_acquired %}
-        </div>
-        <!--- TODO Add buttons for 'today' and 'unknown' (sets to beginning of time)--->
-    </div>
-    <div class="form-group">
-        <label for="{{ form.is_cable.id_for_label }}" class="col-sm-2 control-label">Cable?</label>
-        <div class="col-sm-10">
-            {% render_field form.is_cable|attr:'onchange=checkIfCableHidden()' %}
-        </div>
-    </div>
-    <div class="row">
-      <div class="col-md-10 pull-right">
-        <div class="form-group">
-           <input class="btn btn-primary pull-left" type="submit"/>
+      <label for="{{ form.length.id_for_label }}" class="col-sm-2 control-label">Length</label>
+      <div class="col-sm-10">
+        <div class="input-group">
+          {% render_field form.length|add_class:'form-control' %}
+          <span class="input-group-addon">{{ form.length.help_text }}</span>
         </div>
       </div>
     </div>
+    <div class="form-group">
+      <label for="{{ form.csa.id_for_label }}" class="col-sm-2 control-label">Cross Sectional Area</label>
+      <div class="col-sm-10">
+        <div class="input-group">
+          {% render_field form.csa|add_class:'form-control' value=object.csa %}
+          <span class="input-group-addon">{{ form.csa.help_text }}</span>
+        </div>
+      </div>
+    </div>
+    <div class="form-group">
+      <label for="{{ form.circuits.id_for_label }}" class="col-sm-2 control-label">Circuits</label>
+      <div class="col-sm-10">
+        {% render_field form.circuits|add_class:'form-control' value=object.circuits %}
+      </div>
+    </div>
+    <div class="form-group">
+      <label for="{{ form.cores.id_for_label }}" class="col-sm-2 control-label">Cores</label>
+      <div class="col-sm-10">
+        {% render_field form.cores|add_class:'form-control' value=object.cores %}
+      </div>
+    </div>
+  </div>
 </form>
 {% endblock %}
+
+{% block footer %}
+<div class="form-group">
+  <button class="btn btn-success modal-action" type="submit" form="asset_audit_form">Mark Audited</button>
+</div>
+{% endblock %}
diff --git a/assets/templates/asset_audit_list.html b/assets/templates/asset_audit_list.html
index a3b658ec..6d48dd94 100644
--- a/assets/templates/asset_audit_list.html
+++ b/assets/templates/asset_audit_list.html
@@ -26,6 +26,7 @@
   <h1 class="text-center">Asset Audit List</h1>
 </div>
 
+<h3>Audit Asset:</h3>
 <form id="asset-search-form" class="form-horizontal" method="POST">
   <div class="input-group input-group-lg" style="width: auto;">
     {% render_field form.query|add_class:'form-control' placeholder='Enter Asset ID' autofocus="true" %}
@@ -34,6 +35,7 @@
   </div>
 </form>
 
+<h3>Assets Requiring Audit:</h3>
 <table class="table">
   <thead>
     <tr>
@@ -41,11 +43,11 @@
       <th>Description</th>
       <th>Category</th>
       <th>Status</th>
-      <th class="hidden-xs">Quick Links</th>
+      <th class="hidden-xs"></th>
     </tr>
   </thead>
   <tbody id="asset_table_body">
-    {% include 'partials/asset_list_table_body.html' %}
+    {% include 'partials/asset_list_table_body.html' with audit="true" %}
   </tbody>
 </table>
 
diff --git a/assets/templates/partials/asset_list_table_body.html b/assets/templates/partials/asset_list_table_body.html
index 352d15db..0d38fcd4 100644
--- a/assets/templates/partials/asset_list_table_body.html
+++ b/assets/templates/partials/asset_list_table_body.html
@@ -7,6 +7,9 @@
         <td class="assetCategory" style="vertical-align: middle;">{{ item.category }}</td>
         <td class="assetStatus" style="vertical-align: middle;">{{ item.status }}</td>
         <td class="hidden-xs">
+            {% if audit %}
+                <a type="button" class="btn btn-info" href="{% url 'asset_audit' item.asset_id %}"><i class="glyphicon glyphicon-object-align-left"></i> Audit</a>
+            {% else %}
             <div class="btn-group" role="group">
                 <a type="button" class="btn btn-default btn-sm" href="{% url 'asset_detail' item.asset_id %}"><i class="glyphicon glyphicon-eye-open"></i> View</a>
                 {% if perms.assets.change_asset %}
@@ -14,6 +17,7 @@
                 <a type="button" class="btn btn-default btn-sm" href="{% url 'asset_duplicate' item.asset_id %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
                 {% endif %}
             </div>
+            {% endif %}
         </td>
     </tr>
 {% endfor %}