Index: openacs-4/packages/theme-zen/lib/layouts/zen2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/layouts/zen2.adp,v
diff -u -N -r1.1.2.6 -r1.1.2.7
--- openacs-4/packages/theme-zen/lib/layouts/zen2.adp	25 Feb 2007 00:03:51 -0000	1.1.2.6
+++ openacs-4/packages/theme-zen/lib/layouts/zen2.adp	3 Mar 2007 20:03:34 -0000	1.1.2.7
@@ -1,4 +1,5 @@
 <div id="main">
+	
   <div id="main-content">
     <div class="main-content-padding">
       <list name="element_ids_2">
@@ -18,7 +19,6 @@
       </list>
     </div> <!-- /main-content-padding -->
   </div> <!-- /main-content -->
-</div> <!-- /main -->
 
 <div id="sidebar-1">
   <div class="sidebar-1-padding">
@@ -40,3 +40,5 @@
   </div> <!-- /sidebar-1-padding -->
 </div> <!-- /sidebar-1 -->
 
+</div> <!-- /main -->
+
Index: openacs-4/packages/theme-zen/lib/layouts/zen3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/layouts/zen3.adp,v
diff -u -N -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/theme-zen/lib/layouts/zen3.adp	25 Feb 2007 00:03:51 -0000	1.1.2.3
+++ openacs-4/packages/theme-zen/lib/layouts/zen3.adp	3 Mar 2007 20:03:34 -0000	1.1.2.4
@@ -1,24 +1,3 @@
-
-<div id="sidebar-1">
-  <div class="sidebar-1-padding">
-    <list name="element_ids_1">
-      <include src="@element_src@"
-        element_id="@element_ids_1:item@"
-        element_num="@element_ids_1:rownum@"
-        element_first_num="0"
-        action_string="@action_string@"
-        theme_id="@theme_id@"
-        region="1"
-        portal_id="@portal_id@"
-        edit_p="@edit_p@"
-        return_url="@return_url@"
-        hide_links_p="@hide_links_p@"
-        page_id="@page_id@"
-        layout_id="@layout_id@">
-    </list>
-  </div> <!-- /sidebar-1-padding -->
-</div> <!-- /sidebar-1 -->
-
 <div id="main">
   <div id="main-content">
     <div class="main-content-padding">
@@ -39,6 +18,26 @@
       </list>
     </div> <!-- /main-content-padding -->
   </div> <!-- /main-content -->
+
+<div id="sidebar-1">
+  <div class="sidebar-1-padding">
+    <list name="element_ids_1">
+      <include src="@element_src@"
+        element_id="@element_ids_1:item@"
+        element_num="@element_ids_1:rownum@"
+        element_first_num="0"
+        action_string="@action_string@"
+        theme_id="@theme_id@"
+        region="1"
+        portal_id="@portal_id@"
+        edit_p="@edit_p@"
+        return_url="@return_url@"
+        hide_links_p="@hide_links_p@"
+        page_id="@page_id@"
+        layout_id="@layout_id@">
+    </list>
+  </div> <!-- /sidebar-1-padding -->
+</div> <!-- /sidebar-1 -->
 </div> <!-- /main -->
       
 <div id="sidebar-2">