Index: app/views/feedlist/index.rhtml
===================================================================
--- app/views/feedlist/index.rhtml	(revision 574)
+++ app/views/feedlist/index.rhtml	(working copy)
@@ -1,3 +1,7 @@
+<div id="input_box">
+  <%= render "sidebar/sidebar" %>
+</div><!-- End of input box -->
+
 <div id="display_box">
 	<div id="feeds">
 	<div id="feedlegend">
@@ -80,8 +84,4 @@
 		</li>
 	</ul>
 	</div>
-</div><!-- End of display_box -->
-
-<div id="input_box">
-  <%= render "sidebar/sidebar" %>
-</div><!-- End of input box -->
\ No newline at end of file
+</div><!-- End of display_box -->
\ No newline at end of file
Index: app/views/preferences/edit.rhtml
===================================================================
--- app/views/preferences/edit.rhtml	(revision 574)
+++ app/views/preferences/edit.rhtml	(working copy)
@@ -1,27 +1,3 @@
-<div id="display_box" class="container context">
-    <h2>Help on preferences</h2>
-    <p>The preference settings should mostly be self-explanatory, but some hints are included below: </p>
-    <ul>
-      <li><strong>first name and last name:</strong> Used for display purposes if set</li>
-      <li><strong>date format:</strong> the format in which you'd like dates to be shown. For example, for the date 31st January 2006, %d/%m/%Y will show 31/01/2006, %b-%e-%y will show Jan-31-06. See the <a href="http://uk2.php.net/strftime" title="PHP strftime manual">strftime manual</a> for more formatting options for the date.</li>
-      <li><strong>title date format:</strong> same as above, but for the big date at the top of each page.</li>
-      <li><strong>time zone:</strong> your local time zone</li>
-      <li><strong>week starts:</strong> day of the week shown as the start of the week on the popup calendar.</li>
-      <li><strong>due style:</strong> style in which due dates are shown, e.g.  "Due in 3 days",  "Due on Wednesday"</li>
-      <li><strong>show completed projects in sidebar:</strong> whether or not projects marked as complete are shown in the sidebar on the home page and elsewhere</li>
-      <li><strong>show hidden contexts in sidebar:</strong> whether or not contexts marked as hidden are shown in the sidebar on the home page and elsewhere</li>
-      <li><strong>show project on todo done:</strong> whether or not to redirect to the project page when an action associated with a project is marked complete</li>
-      <% if @user.is_admin? %>
-        <li><strong>admin email:</strong> email address for the admin user of Tracks (displayed on the signup page for users to contact to obtain an account)</li>
-      <% end %>
-      <li><strong>staleness starts:</strong> the number of days before items with no due date get marked as stale (with a yellow highlight)</li>
-      <li><strong>show number completed:</strong> number of completed actions to show on the home page. If you set this to zero, the completed actions box will not be shown on the home page or on the individual context or project pages. You can still see all your completed items by clicking the 'Done' link in the navigation bar at the top of each page.</li>
-      <li><strong>refresh:</strong> automatic refresh interval for each of the pages (in minutes)</li>
-      <li><strong>verbose action descriptor:</strong> when true, show project/context name in action listing; when false show [P]/[C] with tool tips</li>
-      <li><strong>mobile todos per page:</strong> the maximum number of actions to show on a single page in the mobile view</li>
-    </ul>
-</div>
-
 <div id="input_box" class="container context">
   <% form_tag :action => 'update' do %>
 	  <table>
@@ -73,4 +49,28 @@
 	    </tr>
 	  </table>
   <% end %>
+</div>
+
+<div id="display_box" class="container context">
+    <h2>Help on preferences</h2>
+    <p>The preference settings should mostly be self-explanatory, but some hints are included below: </p>
+    <ul>
+      <li><strong>first name and last name:</strong> Used for display purposes if set</li>
+      <li><strong>date format:</strong> the format in which you'd like dates to be shown. For example, for the date 31st January 2006, %d/%m/%Y will show 31/01/2006, %b-%e-%y will show Jan-31-06. See the <a href="http://uk2.php.net/strftime" title="PHP strftime manual">strftime manual</a> for more formatting options for the date.</li>
+      <li><strong>title date format:</strong> same as above, but for the big date at the top of each page.</li>
+      <li><strong>time zone:</strong> your local time zone</li>
+      <li><strong>week starts:</strong> day of the week shown as the start of the week on the popup calendar.</li>
+      <li><strong>due style:</strong> style in which due dates are shown, e.g.  "Due in 3 days",  "Due on Wednesday"</li>
+      <li><strong>show completed projects in sidebar:</strong> whether or not projects marked as complete are shown in the sidebar on the home page and elsewhere</li>
+      <li><strong>show hidden contexts in sidebar:</strong> whether or not contexts marked as hidden are shown in the sidebar on the home page and elsewhere</li>
+      <li><strong>show project on todo done:</strong> whether or not to redirect to the project page when an action associated with a project is marked complete</li>
+      <% if @user.is_admin? %>
+        <li><strong>admin email:</strong> email address for the admin user of Tracks (displayed on the signup page for users to contact to obtain an account)</li>
+      <% end %>
+      <li><strong>staleness starts:</strong> the number of days before items with no due date get marked as stale (with a yellow highlight)</li>
+      <li><strong>show number completed:</strong> number of completed actions to show on the home page. If you set this to zero, the completed actions box will not be shown on the home page or on the individual context or project pages. You can still see all your completed items by clicking the 'Done' link in the navigation bar at the top of each page.</li>
+      <li><strong>refresh:</strong> automatic refresh interval for each of the pages (in minutes)</li>
+      <li><strong>verbose action descriptor:</strong> when true, show project/context name in action listing; when false show [P]/[C] with tool tips</li>
+      <li><strong>mobile todos per page:</strong> the maximum number of actions to show on a single page in the mobile view</li>
+    </ul>
 </div>
\ No newline at end of file
Index: app/views/contexts/show.rhtml
===================================================================
--- app/views/contexts/show.rhtml	(revision 574)
+++ app/views/contexts/show.rhtml	(working copy)
@@ -1,3 +1,8 @@
+<div id="input_box">
+  <%= render :partial => "shared/add_new_item_form" %>
+<%= render "sidebar/sidebar" %>
+</div><!-- End of input box -->
+
 <div id="display_box">
 <%= render :partial => "contexts/context", :locals => { :context => @context, :collapsible => false } %>
 <%= render :partial => "todos/completed", :locals => { :done => @done, :collapsible => false, :append_descriptor => "in this context (last #{@user.prefs.show_number_completed})" } %>
@@ -2,7 +7,2 @@
 
-</div><!-- [end:display_box] -->
-
-<div id="input_box">
-  <%= render :partial => "shared/add_new_item_form" %>
-<%= render "sidebar/sidebar" %>
-</div><!-- End of input box -->
\ No newline at end of file
+</div><!-- [end:display_box] -->
\ No newline at end of file
Index: app/views/contexts/index.rhtml
===================================================================
--- app/views/contexts/index.rhtml	(revision 574)
+++ app/views/contexts/index.rhtml	(working copy)
@@ -1,12 +1,3 @@
-<div id="display_box">
-  <div id="list-contexts">
-    <div id="contexts-empty-nd" style="display:<%= @no_contexts ? 'block' : 'none'%>;">
-      <div class="message"><p>Currently there are no contexts</p></div>
-    </div>
-    <%= render :partial => 'context_listing', :collection => @contexts %>
-  </div>
-</div>
-
 <div id="input_box">
   <a id="toggle-new-context-form" href="#" accesskey="n" title="Create a new context">Create new context &#187;</a>
   <div id="context_new" class="context_new" style="display:block">
@@ -24,6 +15,16 @@
     <% end -%>
   </div>
 </div>
+
+<div id="display_box">
+  <div id="list-contexts">
+    <div id="contexts-empty-nd" style="display:<%= @no_contexts ? 'block' : 'none'%>;">
+      <div class="message"><p>Currently there are no contexts</p></div>
+    </div>
+    <%= render :partial => 'context_listing', :collection => @contexts %>
+  </div>
+</div>
+
 <%
 sortable_element 'list-contexts', get_listing_sortable_options
 
Index: app/views/todos/index.rhtml
===================================================================
--- app/views/todos/index.rhtml	(revision 574)
+++ app/views/todos/index.rhtml	(working copy)
@@ -1,3 +1,8 @@
+<div id="input_box">
+  <%= render :partial => "shared/add_new_item_form" %>
+  <%= render "sidebar/sidebar" %>
+</div><!-- End of input box -->
+
 <div id="display_box">
   
   <%= render :partial => "contexts/context", :collection => @contexts_to_show, 
@@ -6,9 +11,4 @@
     <%= render :partial => "todos/completed", 
             :locals => { :done => @done, :collapsible => true, :append_descriptor => nil } %>
   <% end -%>
-</div><!-- End of display_box -->
-
-<div id="input_box">
-  <%= render :partial => "shared/add_new_item_form" %>
-  <%= render "sidebar/sidebar" %>
-</div><!-- End of input box -->
\ No newline at end of file
+</div><!-- End of display_box -->
\ No newline at end of file
Index: app/views/todos/list_deferred.rhtml
===================================================================
--- app/views/todos/list_deferred.rhtml	(revision 574)
+++ app/views/todos/list_deferred.rhtml	(working copy)
@@ -1,3 +1,8 @@
+<div id="input_box">
+  <%= render :partial => "shared/add_new_item_form" %>
+  <%= render "sidebar/sidebar" %>
+</div><!-- End of input box -->
+
 <div id="display_box">
   
   <%= render :partial => "contexts/context", :collection => @contexts, 
@@ -3,8 +8,3 @@
             :locals => { :collapsible => true } %>
 
-</div><!-- End of display_box -->
-
-<div id="input_box">
-  <%= render :partial => "shared/add_new_item_form" %>
-  <%= render "sidebar/sidebar" %>
-</div><!-- End of input box -->
\ No newline at end of file
+</div><!-- End of display_box -->
\ No newline at end of file
Index: app/views/todos/tag.rhtml
===================================================================
--- app/views/todos/tag.rhtml	(revision 574)
+++ app/views/todos/tag.rhtml	(working copy)
@@ -1,3 +1,8 @@
+<div id="input_box">
+  <%= render :partial => "shared/add_new_item_form" %>
+  <%= render "sidebar/sidebar" %>
+</div><!-- End of input box -->
+
 <div id="display_box">
   <div class="container context" <%= "style=\"display:none\"" unless @not_done_todos.empty? %>>
     <h2>
@@ -17,9 +22,4 @@
     <%= render :partial => "todos/completed", 
             :locals => { :done => @done, :collapsible => true, :append_descriptor => "for this tag" } %>
   <% end -%>
-</div><!-- End of display_box -->
-
-<div id="input_box">
-  <%= render :partial => "shared/add_new_item_form" %>
-  <%= render "sidebar/sidebar" %>
-</div><!-- End of input box -->
\ No newline at end of file
+</div><!-- End of display_box -->
\ No newline at end of file
Index: app/views/data/yaml_form.rhtml
===================================================================
--- app/views/data/yaml_form.rhtml	(revision 574)
+++ app/views/data/yaml_form.rhtml	(working copy)
@@ -1,3 +1,7 @@
+<div id="input_box">
+
+</div><!-- End of input box -->
+
 <div id="display_box">
 	<div id="feeds">
 	<div id="feedlegend">
@@ -12,8 +16,4 @@
 </p>
 
 	</div><!-- End of feeds -->
-</div><!-- End of display_box -->
-
-<div id="input_box">
-
-</div><!-- End of input box -->
\ No newline at end of file
+</div><!-- End of display_box -->
\ No newline at end of file
Index: app/views/projects/index.rhtml
===================================================================
--- app/views/projects/index.rhtml	(revision 574)
+++ app/views/projects/index.rhtml	(working copy)
@@ -1,12 +1,3 @@
-<div id="display_box">
-    <div id="projects-empty-nd" style="display:<%= @no_projects ? 'block' : 'none'%>;">
-	      <div class="message"><p>Currently there are no projects</p></div>
-	</div>
-  <%= render :partial => 'project_state_group', :object => @active_projects, :locals => { :state => 'active'} %>
-  <%= render :partial => 'project_state_group', :object => @hidden_projects, :locals => { :state => 'hidden'} %>
-  <%= render :partial => 'project_state_group', :object => @completed_projects, :locals => { :state => 'completed'} %>
-</div>
-
 <% @project = @new_project -%>
 <div id="input_box">
   <%= link_to_function("Create a new project &#187;",
@@ -37,3 +28,13 @@
     <% end -%>
   </div>
 </div>
+
+<div id="display_box">
+    <div id="projects-empty-nd" style="display:<%= @no_projects ? 'block' : 'none'%>;">
+	      <div class="message"><p>Currently there are no projects</p></div>
+	</div>
+  <%= render :partial => 'project_state_group', :object => @active_projects, :locals => { :state => 'active'} %>
+  <%= render :partial => 'project_state_group', :object => @hidden_projects, :locals => { :state => 'hidden'} %>
+  <%= render :partial => 'project_state_group', :object => @completed_projects, :locals => { :state => 'completed'} %>
+</div>
+
Index: app/views/projects/show.rhtml
===================================================================
--- app/views/projects/show.rhtml	(revision 574)
+++ app/views/projects/show.rhtml	(working copy)
@@ -1,3 +1,8 @@
+<div id="input_box">
+  <%= render :partial => "shared/add_new_item_form" %>
+  <%= render "sidebar/sidebar" %>
+</div><!-- End of input box -->
+
 <div id="display_box">
   <div id="project-next-prev">
     <%= project_next_prev %>
@@ -70,7 +75,3 @@
 </div>
 </div><!-- [end:display_box] -->
 
-<div id="input_box">
-  <%= render :partial => "shared/add_new_item_form" %>
-  <%= render "sidebar/sidebar" %>
-</div><!-- End of input box -->
Index: public/stylesheets/standard.css
===================================================================
--- public/stylesheets/standard.css	(revision 574)
+++ public/stylesheets/standard.css	(working copy)
@@ -1,7 +1,6 @@
-/* @override http://0.0.0.0:3000/stylesheets/standard.css?1181841150 */
-
-/* @override http://0.0.0.0:3000/stylesheets/standard.css?1180885851 */
-
+body {
+	min-width: 780px;
+}
 body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td { 
 	margin:0;
 	padding:0;
@@ -109,9 +108,10 @@
       }
       
 #display_box {
-      float: left;
-      width: 55%;
-      margin: 0px 10px 50px 15px;
+      margin-top: 0px;
+      margin-right: 320px;
+      margin-bottom: 50px;
+      margin-left: 15px;
       }
 
 #single_box {
@@ -137,6 +137,7 @@
       position: fixed;
       top: 48px;
       left: 0px;
+      min-width: 780px;
       }
             
 #navlist {
@@ -246,8 +247,8 @@
       }
       
 div#input_box {
-      margin: 0px 15px 0px 58%;
-      padding: 0px 15px 0px 0px;
+      float: right;
+      margin: 0px 15px 0px 15px;
       }
 
 #input_box h2 {
@@ -269,7 +270,6 @@
 div.item-container {
       padding: 2px 0px;
       line-height:20px;
-      clear: both;
       }
       
 a.icon {
@@ -591,8 +591,7 @@
     }
 
 div#list-active-projects, div#list-hidden-projects, div#list-completed-projects, div#list-contexts, div#projects-empty-nd {
-    clear:right;
-	border: 1px solid #999;
+    border: 1px solid #999;
     }
 .project-state-group h2 {
 	margin:20px 0px 8px 13px;
@@ -690,7 +689,7 @@
 	height: 25px;
 	padding: 5px 0;
 	text-align: center;
-	clear: right;
+	clear: left;
 }
 
 .edit_todo_form input, .edit_todo_form textarea {
@@ -698,7 +697,7 @@
 }
 
 .edit_todo_form .tag_list_label {
-	clear:both;
+	clear:left;
 }
 .edit_todo_form .due_input, .edit_todo_form .show_from_input, .edit_todo_form .project_input, .edit_todo_form .context_input {
 	width:48%;
@@ -1033,4 +1032,4 @@
 	background-repeat:no-repeat;
 	background-position:center center;
 	background-color:black;
-}
\ No newline at end of file
+}