diff --git a/theme/oceanblue/footer.html b/theme/oceanblue/footer.html
index 365f689f007..1f5851a4bfc 100644
--- a/theme/oceanblue/footer.html
+++ b/theme/oceanblue/footer.html
@@ -2,12 +2,20 @@
 </div> <!-- end div containerContent -->
 <!-- START OF FOOTER -->
 <div id="footer">
-<hr size="1" noshade="noshade" />
+
+<?php if (!$home and $heading) {  // Most pages with heading, except home page ?>
+    <div class="navbar">
+        <div class="breadcrumb"><?php print_navigation("$navigation"); ?></div>
+        <div class="menu"><?php echo $menu; ?></div>
+    </div>
+    <div class="clearer">&nbsp;</div>
+<?php } ?>
+
 <?php echo $loggedinas ?>
 <p class="homelink"><?php echo $homelink ?></p>
 
-
 <?php if (isadmin()) { ?>
+<br />
 <hr size="1" noshade="noshade" />
 <p align="center">
 <a href="http://validator.w3.org/check?verbose=1&amp;ss=1&amp;uri=<?php echo urlencode(qualified_me()) ?>">Validate HTML</a> |
diff --git a/theme/oceanblue/header.html b/theme/oceanblue/header.html
index ae4e4b5d3f5..1c984999436 100644
--- a/theme/oceanblue/header.html
+++ b/theme/oceanblue/header.html
@@ -32,9 +32,9 @@
 <?php } ?>
     <div class="clearer">&nbsp;</div>
 <?php if ($navigation) { // This is the navigation table with breadcrumbs  ?>
-    <div id="nav-bar">
-        <div id="breadcrumb"><?php print_navigation("$navigation"); ?></div>
-        <div id="navbutton"><?php echo $button; ?></div>
+    <div class="navbar">
+        <div class="breadcrumb"><?php print_navigation("$navigation"); ?></div>
+        <div class="navbutton"><?php echo $button; ?></div>
     </div>
 <?php } else if ($heading) { // If no navigation, but a heading, then print a line  
 ?>
diff --git a/theme/oceanblue/styles_color.css b/theme/oceanblue/styles_color.css
index 943e618bebf..23441fb8b8f 100644
--- a/theme/oceanblue/styles_color.css
+++ b/theme/oceanblue/styles_color.css
@@ -58,8 +58,14 @@ body {
 }
 
 th.header,
-td.header {
-    background-color:#DDDDDD;
+td.header,
+div.header {
+    background-color:#EEEEEE;
+}
+
+.navbar {
+    background-color:#EEEEEE;
+    border-color:#DDDDDD;
 }
 table.formtable tbody th {
     background: none;
diff --git a/theme/oceanblue/styles_fonts.css b/theme/oceanblue/styles_fonts.css
index f17ac562b12..eb949052bae 100644
--- a/theme/oceanblue/styles_fonts.css
+++ b/theme/oceanblue/styles_fonts.css
@@ -105,12 +105,12 @@ h4 {
     font-size:0.8em;
 }
 
-.headingblock .title {
+.headingblock {
     font-weight: normal;
 }
+
 .headingblock .link {
     font-size: 0.9em;
-    font-weight: normal;
 }
 
 .files .file {
@@ -142,7 +142,7 @@ h4 {
     font-size:1.3em;
 }
 
-#breadcrumb {
+.breadcrumb {
     font-size:0.9em;
     font-weight:normal;
 }
diff --git a/theme/oceanblue/styles_layout.css b/theme/oceanblue/styles_layout.css
index 73e9879c198..18e1cf68ba4 100644
--- a/theme/oceanblue/styles_layout.css
+++ b/theme/oceanblue/styles_layout.css
@@ -39,8 +39,8 @@ h6.main {
 
 #layout-table {
     width:100%;
-    border-spacing:5px;
     border-collapse:separate;
+    margin-top: 8px;
 }
 
 #layout-table #left-column,
@@ -50,6 +50,11 @@ h6.main {
     vertical-align:top;
 }
 
+#layout-table #middle-column {
+    padding-left:12px;
+    padding-right:12px;
+}
+
 .clearer {
     clear:both;
     margin:0px;
@@ -205,20 +210,27 @@ table.formtable tbody th
     text-align:right;
 }
 
-#nav-bar {
+.navbar {
     padding:3px 0.5em;
     height:1.3em;
+    border-width:1px;
+    border-style:solid;
 }
 
-#breadcrumb {
+.navbar .breadcrumb {
     float:left;
     margin:0.2em 0em;
 }
 
-#navbutton {
+.navbar .navbutton,
+.navbar .menu {
     float:right;
 }
 
+#footer .navbar {
+    margin-top: 4em;
+}
+
 
 /***
  *** Footer