diff --git a/theme/wood/footer.html b/theme/wood/footer.html
index b0dc78a4602..06869bf6933 100644
--- a/theme/wood/footer.html
+++ b/theme/wood/footer.html
@@ -11,12 +11,12 @@
     echo "</div>";
 ?>
 
-<?php if (!empty($performanceinfo)) {
-    echo $performanceinfo;
-}
-?>
 <?php echo $loggedinas ?>
 <?php echo $homelink ?>
+
+<?php if (!empty($performanceinfo)) {
+    echo $performanceinfo;
+} ?>
 </div>
 </div>
 </body>
diff --git a/theme/wood/header.html b/theme/wood/header.html
index 292c09f6cb9..6984f23fbfc 100644
--- a/theme/wood/header.html
+++ b/theme/wood/header.html
@@ -19,23 +19,22 @@
 
 <?php if ($home) {  // This is what gets printed on the home page only  
 ?>
-    <div id="header-home">
-        <div class="headermain"><?php echo $heading ?></div>
+    <div id="header-home" class="clearfix">
+        <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
     </div>
 <?php } else if ($heading) {  // This is what gets printed on any other page with a heading 
 ?>
-    <div id="header">
-        <div class="headermain"><?php echo $heading ?></div>
+    <div id="header" class="clearfix">
+        <h1 class="headermain"><?php echo $heading ?></h1>
         <div class="headermenu"><?php echo $menu ?></div>
     </div>
 <?php } ?>
-    <div class="clearer">&nbsp;</div>
 <?php if ($navigation) { // This is the navigation table with breadcrumbs  ?>
-    <table class="navbar"><tr><td>
+    <div class="navbar clearfix">
         <div class="breadcrumb"><?php print_navigation($navigation); ?></div>
         <div class="navbutton"><?php echo $button; ?></div>
-    </td></tr></table>
+    </div>
 <?php } else if ($heading) { // If no navigation, but a heading, then print a line  
 ?>
         <hr size="1" noshade="noshade" />