diff --git a/assets/templates/asset_list_table_body.html b/assets/templates/asset_list_table_body.html
index 661920ba..fbec39d8 100644
--- a/assets/templates/asset_list_table_body.html
+++ b/assets/templates/asset_list_table_body.html
@@ -7,9 +7,9 @@
         <td>{{ item.status }}</td>
         <td>
             <div class="btn-group" role="group">
-                <button type="button" class="btn btn-default" formaction="{% url 'asset_detail' item.pk %}"><i class="glyphicon glyphicon-eye-open"></i> View</button>
-                <button type="button" class="btn btn-default" formaction="{% url 'asset_update' item.pk %}"><i class="glyphicon glyphicon-edit"></i> Edit</button>
-                <button type="button" class="btn btn-default" formaction="{% url 'asset_update' item.pk %}?duplicate=true"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</button>
+                <a type="button" class="btn btn-default" href="{% url 'asset_detail' item.pk %}"><i class="glyphicon glyphicon-eye-open"></i> View</a>
+                <a type="button" class="btn btn-default" href="{% url 'asset_update' item.pk %}"><i class="glyphicon glyphicon-edit"></i> Edit</a>
+                <a type="button" class="btn btn-default" href="{% url 'asset_update' item.pk %}?duplicate=true"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
             </div>
         </td>
     </tr>
diff --git a/assets/templates/helpers/render_field.html b/assets/templates/helpers/render_field.html
index e372f92c..b1cd91b3 100644
--- a/assets/templates/helpers/render_field.html
+++ b/assets/templates/helpers/render_field.html
@@ -3,13 +3,13 @@
 <div class="form-group">
     <label for="{{ field.id_for_label }}">{{ label|default:field.label }}</label>
     {% if css %}
-    {% render_field field|add_class:'form-control' %}
+    {% render_field  field|add_class:css %}
     {% elif disable_if_filled and field.value %}
-    {% render_field field|attr:'disabled'|add_class:'form-control' %}
+    {% render_field  field|attr:'disabled' %}
     {% elif css and disable_if_filled %}
-    {% render_field field|add_class:'form-control'|attr:'disabled' %}
+    {% render_field  field|add_class:css|attr:'disabled' %}
     {% else %}
-    {{ field|add_class:'form-control' }}
+    {{ field }}
     {% endif %}
     <span class="helper-text" data-error="{{ field.errors.text }}"></span>
 </div>