diff --git a/apps/common/templates/generic_form_subtemplate.html b/apps/common/templates/generic_form_subtemplate.html
index 4cee0dac94..b894ea2ef0 100755
--- a/apps/common/templates/generic_form_subtemplate.html
+++ b/apps/common/templates/generic_form_subtemplate.html
@@ -77,8 +77,8 @@
         </div>
         {% endif %}
     </form>
-    {% if sidebar %}
-        </p></div></div>
+    {% if side_bar %}
+        </p></div><!--end content--></div><!--end block-->
     {% else %}
         </div></div>
     {% endif %}
diff --git a/apps/web_theme/templates/web_theme_base.html b/apps/web_theme/templates/web_theme_base.html
index 9874a06036..5fbcc7180c 100755
--- a/apps/web_theme/templates/web_theme_base.html
+++ b/apps/web_theme/templates/web_theme_base.html
@@ -81,14 +81,14 @@
                             {% endif %}
                             {% block web_theme_messages %}{% endblock %}
                             {% block web_theme_content %}{% endblock %}
-                        </div>  
+                        </div><!--end .block #block-text-->  
                         {% block web_theme_footer %}{% endblock %}
-                    </div> 
+                    </div><!--end #main-->
                     <div id="sidebar">
                         {% block web_theme_sidebar %}{% endblock %}
-                    </div>                    
-                </div>
+                    </div><!--end #sidebar-->                 
+                </div><!--end #wrapper .wat-cf-->
             {% endif %}
-        </div>
+        </div><!--end #container-->
     </body>
 </html>