Index: app/views/layouts/base.html.erb
===================================================================
--- app/views/layouts/base.html.erb	(revision 17769)
+++ app/views/layouts/base.html.erb	(working copy)
@@ -100,17 +100,19 @@
 </div>
 
 <div id="main" class="<%= sidebar_content? ? '' : 'nosidebar' %>">
-    <div id="sidebar">
-        <%= yield :sidebar %>
-        <%= view_layouts_base_sidebar_hook_response %>
-    </div>
 
-    <div id="content">
-        <%= render_flash_messages %>
-        <%= yield %>
-        <%= call_hook :view_layouts_base_content %>
-        <div style="clear:both;"></div>
-    </div>
+  <div id="content">
+      <%= render_flash_messages %>
+      <%= yield %>
+      <%= call_hook :view_layouts_base_content %>
+      <div style="clear:both;"></div>
+  </div>
+
+  <div id="sidebar">
+      <%= yield :sidebar %>
+      <%= view_layouts_base_sidebar_hook_response %>
+  </div>
+
 </div>
 </div>
 
Index: public/stylesheets/application.css
===================================================================
--- public/stylesheets/application.css	(revision 17769)
+++ public/stylesheets/application.css	(working copy)
@@ -80,9 +80,9 @@
 #admin-menu ul {margin: 0;  padding: 0;}
 #admin-menu li {margin: 0;  padding: 0 0 6px 0; list-style-type:none;}
 
-#main {background-color:#EEEEEE;}
+#main {display: flex}
 
-#sidebar{ float: right; width: 22%; position: relative; z-index: 9; padding: 0; margin: 0;}
+#sidebar{ width: 220px; padding: 20px; background: #eee; border-left: 1px solid #ddd;}
 * html #sidebar{ width: 22%; }
 #sidebar h3{ font-size: 14px; margin-top:14px; color: #666;  }
 #sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; }
@@ -93,13 +93,12 @@
 #sidebar div.wiki ul {margin:inherit; padding-left:40px;}
 #sidebar div.wiki ul li {list-style-type:inherit;}
 
-#content { width: 75%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; }
+#content { width: 100%; background-color: #fff; margin: 0px; padding: 6px 10px 10px 10px; }
 * html #content{ width: 75%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}
 html>body #content { min-height: 600px; }
 * html body #content { height: 600px; } /* IE */
 
 #main.nosidebar #sidebar{ display: none; }
-#main.nosidebar #content{ width: auto; border-right: 0; }
 
 #footer {clear: both; border-top: 1px solid #bbb; font-size: 0.9em; color: #aaa; padding: 5px; text-align:center; background:#fff;}