diff --git a/assets/templates/partials/cable_form.html b/assets/templates/partials/cable_form.html
index 3d5674c1..4409f08f 100644
--- a/assets/templates/partials/cable_form.html
+++ b/assets/templates/partials/cable_form.html
@@ -6,24 +6,13 @@
   <div class="card-body">
     {% if create or edit or duplicate %}
     <div class="form-group">
-      <label for="{{ form.cable_type.id_for_label }}">Cable Type</label>
-      <div class="input-group">
-        {% render_field form.cable_type|add_class:'form-control' %}
-      </div>
+      {% include 'partials/form_field.html' with field=form.cable_type %}
     </div>
     <div class="form-group">
-      <label for="{{ form.length.id_for_label }}">Length</label>
-      <div class="input-group">
-        {% render_field form.length|add_class:'form-control' %}
-        <span class="input-group-addon">{{ form.length.help_text }}</span>
-      </div>
+      {% include 'partials/form_field.html' with field=form.length append=form.length.help_text %}
     </div>
     <div class="form-group">
-      <label for="{{ form.csa.id_for_label }}">Cross Sectional Area</label>
-      <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>
+      {% include 'partials/form_field.html' with field=form.csa append=form.csa.help_text %}
     </div>
     {% else %}
     <dl>
diff --git a/assets/templates/partials/form_field.html b/assets/templates/partials/form_field.html
index feeacff2..82e328d6 100644
--- a/assets/templates/partials/form_field.html
+++ b/assets/templates/partials/form_field.html
@@ -17,6 +17,6 @@
   {% endif %}
 </div>
 {% else %}
-{% render_field field|add_class:'form-control'|add_class:col %}
+{% render_field field|add_class:'form-control' class+=col %}
 {% endif %}
 {% endspaceless %}