diff --git a/bootstrapform/templates/bootstrapform/form.html b/bootstrapform/templates/bootstrapform/form.html
index 173b5a5..e22d708 100644
--- a/bootstrapform/templates/bootstrapform/form.html
+++ b/bootstrapform/templates/bootstrapform/form.html
@@ -1,7 +1,13 @@
 {% load bootstrap %}
 
-{% for field in form %}
-    <div class="clearfix {% if field.errors %}error{% endif %}">
+{{ form.non_field_errors }}
+
+{% for field in form.hidden_fields %}
+    {{ field }}
+{% endfor %}
+
+{% for field in form.visible_fields %}
+    <div class="clearfix{% if field.errors %} error{% endif %}">
         {% if field|is_checkbox %}
             <ul class="inputs-list">
                 <li>
@@ -25,3 +31,4 @@
         {% endif %}
     </div>
 {% endfor %}
+