diff --git a/apps/common/templates/generic_form.html b/apps/common/templates/generic_form.html
index 295fe0d25d..644efe59bf 100755
--- a/apps/common/templates/generic_form.html
+++ b/apps/common/templates/generic_form.html
@@ -3,13 +3,12 @@
 {% block content %}
 <div class="container_12">
     {% if form %}
-                <div class="grid_{{ form.grid|default:11 }}">
-        {% include "generic_form_subtemplate.html" %}
-
-            </div>
-            {% if form.grid_clear or not form.grid %}
-                <div class="clear"></div> 
-            {% endif %}
+        <div class="grid_{{ form.grid|default:11 }}">
+            {% include "generic_form_subtemplate.html" %}
+        </div>
+        {% if form.grid_clear or not form.grid %}
+            <div class="clear"></div> 
+        {% endif %}
     {% endif %}
 
     {% for form in form_list %}
@@ -20,16 +19,13 @@
         {% with form.object_name as object_name %}
         {% with form.form_action as form_action %}
             <div class="grid_{{ form.grid|default:11 }}">
-        {% with form.form as form %}
-            {% include "generic_form_subtemplate.html" %}
-        {% endwith %}
-
+                {% with form.form as form %}
+                    {% include "generic_form_subtemplate.html" %}
+                {% endwith %}
             </div>
             {% if form.grid_clear or not form.grid %}
                 <div class="clear"></div> 
             {% endif %}
-
-        
         {% endwith %}
         {% endwith %}
         {% endwith %}