diff --git a/lib/gollum/frontend/public/gollum/css/gollum.css b/lib/gollum/frontend/public/gollum/css/gollum.css
index 64eec5b3..57b323af 100755
--- a/lib/gollum/frontend/public/gollum/css/gollum.css
+++ b/lib/gollum/frontend/public/gollum/css/gollum.css
@@ -37,9 +37,8 @@ a:hover, a:visited {
 
 /* @section head */
 #head {
-  border-bottom: 1px solid #ccc;
+  border-bottom: 1px solid #ddd;
   margin: 4.5em 0 0.5em;
-  padding: 0.5em 0;
   overflow: hidden;
 }
 
@@ -209,6 +208,7 @@ a:hover, a:visited {
 
   /* @section page-footer */
   .page #footer {
+    border-top: 1px solid #ddd;
     margin: 1em 0 7em;
   }
 
@@ -482,8 +482,9 @@ ul.actions {
 
  ul.actions li {
    float: left;
-   font-size: 1em;
+   font-size: 0.9em;
    margin-left: 0.6em;
+   margin-bottom: 0.6em;
  }
 
 .minibutton a {
@@ -595,28 +596,30 @@ ul.actions {
     background: #fff;
     border: 1px solid #d4d4d4;
     overflow: hidden;
+    height: 2.0em;
 
     border-radius: 0.3em;
     -moz-border-radius: 0.3em;
     -webkit-border-radius: 0.3em;
   }
 
+  .ie #head #searchbar #searchbar-fauxtext,
+  .ff #head #searchbar #searchbar-fauxtext {
+     height: 2.2em
+  }
+
   #head #searchbar #searchbar-fauxtext input#search-query {
     border: none;
     color: #000;
     float: left;
     font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
     font-size: 1em;
-    height: 2.15em;
+    height: inherit;
     padding: 0 .5em;
 
     -webkit-focus-ring: none;
   }
 
-  .ff #head #searchbar #searchbar-fauxtext input#search-query {
-    padding: 0.2em 0 0.2em 0.5em;
-  }
-
   .ie #head #searchbar #searchbar-fauxtext input#search-query {
     padding: 0.4em 0 0 0.5em;
   }
@@ -632,7 +635,7 @@ ul.actions {
     margin: 0 !important;
     padding: 0;
     float: right;
-    font-size: 1.2em;
+    height: inherit;
 
     border-radius: 0 3px 3px 0;
     -moz-border-radius: 0 3px 3px 0;
@@ -641,10 +644,10 @@ ul.actions {
 
   #head #searchbar #searchbar-fauxtext #search-submit span {
     background-image: url(/images/icon-sprite.png);
-    background-position: -431px 0px;
+    background-position: -431px -1px;
     background-repeat: no-repeat;
     display: block;
-    height: 1.8em;
+    height: inherit;
     overflow: hidden;
     text-indent: -5000px;
     width: 28px;
@@ -656,6 +659,6 @@ ul.actions {
   }
 
   #head #searchbar #searchbar-fauxtext #search-submit:hover span {
-    background-position: -431px -27px;
+    background-position: -431px -28px;
     padding: 0;
   }
diff --git a/lib/gollum/frontend/templates/compare.mustache b/lib/gollum/frontend/templates/compare.mustache
index db079950..254a9b1f 100644
--- a/lib/gollum/frontend/templates/compare.mustache
+++ b/lib/gollum/frontend/templates/compare.mustache
@@ -3,10 +3,12 @@
   <h1>History for <strong>{{path}}</strong></h1>
   
   <ul class="actions">
+    <li class="minibutton">
+      {{>searchbar}}
+    </li>
     <li class="minibutton"><a href="/history/{{escaped_name}}"
        class="action-page-history">Back to Page History</a></li>
   </ul>
-  {{>searchbar}}
 </div>
 
 {{#message}}
@@ -50,4 +52,4 @@
   </ul>
 </div>
 </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/lib/gollum/frontend/templates/history.mustache b/lib/gollum/frontend/templates/history.mustache
index eb4b6f5b..930f76b1 100644
--- a/lib/gollum/frontend/templates/history.mustache
+++ b/lib/gollum/frontend/templates/history.mustache
@@ -2,12 +2,14 @@
 <div id="head">
   <h1>History for <strong>{{title}}</strong></h1>
   <ul class="actions">
+    <li class="minibutton">
+      {{>searchbar}}
+    </li>
     <li class="minibutton"><a href="/{{escaped_name}}"
        class="action-view-page">View Page</a></li>
     <li class="minibutton"><a href="/edit/{{escaped_name}}"
        class="action-edit-page">Edit Page</a></li>
   </ul>
-  {{>searchbar}}
 </div>
 <div id="wiki-history">
   
@@ -57,4 +59,4 @@
        class="action-back-to-top">Back to Top</a></li>
   </ul>
 </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/lib/gollum/frontend/templates/page.mustache b/lib/gollum/frontend/templates/page.mustache
index 9739c07f..8d29fb4c 100644
--- a/lib/gollum/frontend/templates/page.mustache
+++ b/lib/gollum/frontend/templates/page.mustache
@@ -2,6 +2,9 @@
 <div id="head">
   <h1>{{title}}</h1>
   <ul class="actions">
+    <li class="minibutton">
+      {{>searchbar}}
+    </li>
     <li class="minibutton"><a href="/pages"
       class="action-all-pages">All Pages</a></li>
     <li class="minibutton" class="jaws">
@@ -13,7 +16,6 @@
     <li class="minibutton"><a href="/history/{{escaped_name}}"
        class="action-page-history">Page History</a></li>
   </ul>
-  {{>searchbar}}
 </div>
 <div id="wiki-content">
 <div class="wrap {{#has_footer}} has-footer {{/has_footer}} {{#has_sidebar}}  has-rightbar{{/has_sidebar}}">
diff --git a/lib/gollum/frontend/templates/pages.mustache b/lib/gollum/frontend/templates/pages.mustache
index ca666666..5e723705 100644
--- a/lib/gollum/frontend/templates/pages.mustache
+++ b/lib/gollum/frontend/templates/pages.mustache
@@ -2,10 +2,12 @@
 <div id="head">
   <h1>{{title}}</h1>
   <ul class="actions">
+    <li class="minibutton">
+      {{>searchbar}}
+    </li>
     <li class="minibutton"><a href="/"
        class="action-edit-page">Home</a></li>
   </ul>
-  {{>searchbar}}
 </div>
 <div id="results">
 
diff --git a/lib/gollum/frontend/templates/search.mustache b/lib/gollum/frontend/templates/search.mustache
index 080fc9c7..6152f25c 100644
--- a/lib/gollum/frontend/templates/search.mustache
+++ b/lib/gollum/frontend/templates/search.mustache
@@ -2,10 +2,12 @@
 <div id="head">
   <h1>Search Results for <strong>{{query}}</strong></h1>
   <ul class="actions">
+    <li class="minibutton">
+      {{>searchbar}}
+    </li>
     <li class="minibutton"><a href="/"
        class="action-edit-page">Home</a></li>
   </ul>
-  {{>searchbar}}
 </div>
 <div id="results">