diff --git a/theme/standard/footer.html b/theme/standard/footer.html
index 365f689f007..1f5851a4bfc 100644
--- a/theme/standard/footer.html
+++ b/theme/standard/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/standard/header.html b/theme/standard/header.html
index ae4e4b5d3f5..1c984999436 100644
--- a/theme/standard/header.html
+++ b/theme/standard/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/standard/styles_fonts.css b/theme/standard/styles_fonts.css
index 9cac23c0542..6906bc31917 100644
--- a/theme/standard/styles_fonts.css
+++ b/theme/standard/styles_fonts.css
@@ -142,7 +142,7 @@ h4 {
     font-size:1.3em;
 }
 
-#breadcrumb {
+.breadcrumb {
     font-size:0.9em;
     font-weight:bold;
 }
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 8da1c0d7279..c849dad146e 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -205,17 +205,18 @@ table.formtable tbody th
     text-align:right;
 }
 
-#nav-bar {
+.navbar {
     padding:3px 0.5em;
     height:1.3em;
 }
 
-#breadcrumb {
+.navbar .breadcrumb {
     float:left;
     margin:0.2em 0em;
 }
 
-#navbutton {
+.navbar .navbutton,
+.navbar .menu {
     float:right;
 }