diff --git a/lib/gollum/frontend/templates/history.mustache b/lib/gollum/frontend/templates/history.mustache
index a2ef1e88..c7c6a7d4 100644
--- a/lib/gollum/frontend/templates/history.mustache
+++ b/lib/gollum/frontend/templates/history.mustache
@@ -7,6 +7,7 @@
     <li class="minibutton"><a href="/edit/{{escaped_name}}"
        class="action-edit-page">Edit Page</a></li>
   </ul>
+  {{>searchbar}}
 </div>
 <div id="wiki-history">
   
@@ -39,7 +40,7 @@
           [<a href="/{{escaped_name}}/{{id}}" title="View commit">{{id7}}&hellip;</a>]
         </td>
         <td class="revert-action">
-          <a href="javascript:void(0);" title="Revert to this change">Revert to <span>{{id7}}&hellip;</span></a>
+          <a href="#" title="Revert to this change" rel="{{id}}">Revert to <span>{{id7}}&hellip;</span></a>
         </td>
       </tr>
       {{/versions}}
@@ -55,7 +56,7 @@
        class="action-compare-revision">Compare Revisions</a></li>
        
     <!-- only show this button if we have more than 20 revisions -->
-    <li class="minibutton"><a href="javascript:void(0);"
+    <li class="minibutton"><a href="#"
        class="action-back-to-top">Back to Top</a></li>
   </ul>
 </div>
diff --git a/lib/gollum/frontend/templates/layout.mustache b/lib/gollum/frontend/templates/layout.mustache
index 85628e94..52280300 100644
--- a/lib/gollum/frontend/templates/layout.mustache
+++ b/lib/gollum/frontend/templates/layout.mustache
@@ -4,10 +4,12 @@
   <meta http-equiv="Content-type" content="text/html;charset=utf-8">
   <link rel="stylesheet" type="text/css" href="/css/gollum.css" media="all">
   <link rel="stylesheet" type="text/css" href="/css/editor.css" media="all">
+  <link rel="stylesheet" type="text/css" href="/css/dialog.css" media="all">
   <link rel="stylesheet" type="text/css" href="/css/template.css" media="all">
   
   <script type="text/javascript" src="/javascript/jquery.js"></script>
   <script type="text/javascript" src="/javascript/gollum.js"></script>
+  <script type="text/javascript" src="/javascript/gollum.dialog.js"></script>
   <script type="text/javascript" src="/javascript/gollum.fx.js"></script>
   <!-- TODO: only load this on the edit page -->
   <script type="text/javascript" 
diff --git a/lib/gollum/frontend/templates/page.mustache b/lib/gollum/frontend/templates/page.mustache
index e32cf36a..9567ca16 100644
--- a/lib/gollum/frontend/templates/page.mustache
+++ b/lib/gollum/frontend/templates/page.mustache
@@ -7,6 +7,7 @@
     <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/searchbar.mustache b/lib/gollum/frontend/templates/searchbar.mustache
new file mode 100644
index 00000000..1f6bd4c7
--- /dev/null
+++ b/lib/gollum/frontend/templates/searchbar.mustache
@@ -0,0 +1,6 @@
+<div id="searchbar">
+  <div id="searchbar-fauxtext">
+    <input type="text" name="q" id="search-query">
+    <input type="submit" id="search-submit">
+  </div>
+</div>
\ No newline at end of file