Index: app/views/layouts/base.html.erb
===================================================================
--- app/views/layouts/base.html.erb	(revision 17769)
+++ app/views/layouts/base.html.erb	(working copy)
@@ -69,7 +69,6 @@
 </div>
 
 <div id="header">
-
     <a href="#" class="mobile-toggle-button js-flyout-menu-toggle-button"></a>
 
     <% if User.current.logged? || !Setting.login_required? %>
@@ -87,17 +86,17 @@
     <% end %>
 
     <h1><%= page_header_title %></h1>
+</div>
 
-    <% if display_main_menu?(@project) %>
-    <div id="main-menu" class="tabs">
-        <%= render_main_menu(@project) %>
-        <div class="tabs-buttons" style="display:none;">
-            <button class="tab-left" onclick="moveTabLeft(this); return false;"></button>
-            <button class="tab-right" onclick="moveTabRight(this); return false;"></button>
-        </div>
-    </div>
-    <% end %>
+<% if display_main_menu?(@project) %>
+<div id="main-menu" class="tabs">
+    <%= render_main_menu(@project) %>
+        <div class="tabs-buttons" style="display:none;">
+        <button class="tab-left" onclick="moveTabLeft(this); return false;"></button>
+        <button class="tab-right" onclick="moveTabRight(this); return false;"></button>
+    </div>
 </div>
+<% end %>
 
 <div id="main" class="<%= sidebar_content? ? '' : 'nosidebar' %>">
     <div id="sidebar">
Index: public/stylesheets/application.css
===================================================================
--- public/stylesheets/application.css	(revision 17769)
+++ public/stylesheets/application.css	(working copy)
@@ -26,7 +26,7 @@
 
 #account {float:right;}
 
-#header {min-height:5.3em;margin:0;background-color:#628DB6;color:#f8f8f8; padding: 4px 8px 20px 6px; position:relative;}
+#header {min-height:5.3em;margin:0;background-color:#628DB6;color:#f8f8f8; padding: 4px 8px 4px 6px; position:relative;}
 #header a {color:#f8f8f8;}
 #header h1 { overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 #header h1 .breadcrumbs { display:block; font-size: .5em; font-weight: normal; }
@@ -34,7 +34,7 @@
 #quick-search {float:right;}
 #quick-search #q {width:130px; height:24px; box-sizing:border-box; vertical-align:middle; border:1px solid #ccc; border-radius:3px;}
 
-#main-menu {position: absolute;  bottom: 0px;  left:6px; margin-right: -500px; width: 100%;}
+#main-menu {position: relative;  bottom: 0px; margin-right: -500px; width: 100%; background: #628db6;}
 #main-menu ul {margin: 0;  padding: 0; width: 100%; white-space: nowrap;}
 #main-menu li {
   float:none;