diff --git a/mayan/apps/appearance/templates/appearance/generic_form_instance.html b/mayan/apps/appearance/templates/appearance/generic_form_instance.html
index c7f6d71930..79504278e7 100644
--- a/mayan/apps/appearance/templates/appearance/generic_form_instance.html
+++ b/mayan/apps/appearance/templates/appearance/generic_form_instance.html
@@ -15,22 +15,14 @@
 {% endfor %}
 
 {% if form_display_mode_table %}
-    {% for field in form.visible_fields %}
-        {% for error in field.errors %}
-            <div class="message error">
-                <p>{{ error }}</p>
-            </div>
-        {% endfor %}
-    {% endfor %}
-
     {% for field in form.hidden_fields %}
         {{ field }}
     {% endfor %}
     <tr class="{% cycle 'odd' 'even2' %}">
     {% for field in form.visible_fields %}
         <td title="{% if field.errors %}{% for error in field.errors %}{{ error }}{% if not forloop.last %} | {% endif %}{% endfor %}{% else %}{{ field.help_text }}{% endif %}">
-            {% if field.errors %}<div class="error">{% endif %}
-              {{ field }}
+            {% if field.errors %}<div class="has-error">{% endif %}
+              {% render_field field class+="form-control" %}
             {% if field.errors %}</div>{% endif %}
         </td>
     {% endfor %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html
index 077444811e..43c211adf8 100644
--- a/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html
+++ b/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html
@@ -40,23 +40,25 @@
                 {{ formset.management_form }}
 
                 {% if form_display_mode_table %}
-                    <table class="table">
-                        <tbody>
-                        <tr>
-                            {% for field in formset.forms.0.visible_fields %}
-                                <th>
-                                    {{ field.label_tag }}{% if field.field.required and not read_only %} ({% trans 'required' %}){% endif %}
-                                </th>
-                            {% endfor %}
-                        </tr>
-                {% endif %}
+                    <div class="table-responsive">
+                        <table class="table table-condensed table-striped">
+                            <tbody>
+                            <tr>
+                                {% for field in formset.forms.0.visible_fields %}
+                                    <th>
+                                        {{ field.label_tag }}{% if field.field.required and not read_only %} ({% trans 'required' %}){% endif %}
+                                    </th>
+                                {% endfor %}
+                            </tr>
+                    {% endif %}
 
-                {% for form in formset.forms %}
-                    {% include 'appearance/generic_form_instance.html' %}
+                    {% for form in formset.forms %}
+                        {% include 'appearance/generic_form_instance.html' %}
                 {% endfor %}
                 {% if form_display_mode_table %}
-                    </tbody>
+                        </tbody>
                     </table>
+                </div>
                 {% endif %}
             {% endwith %}
         {% else %}