diff --git a/web/templates.go b/web/templates.go
index 475d476..ff23e36 100644
--- a/web/templates.go
+++ b/web/templates.go
@@ -182,9 +182,9 @@
       </div>
     </div>
   </div>
-  <nav class="navbar navbar-default navbar-fixed-bottom">
+  <nav class="navbar navbar-default navbar-bottom">
     <div class="container">
-      <a class="navbar-text" href="about">About</a>
+      {{template "footerBoilerplate"}}
       <p class="navbar-text navbar-right">
         Used {{HumanUnit .Stats.IndexBytes}} mem for
         {{.Stats.Documents}} documents ({{HumanUnit .Stats.ContentBytes}})
@@ -195,7 +195,7 @@
 </body>
 </html>
 `,
-
+	"footerBoilerplate": `<a class="navbar-text" href="about">About</a>`,
 	"results": `
 <html>
 {{template "head"}}
@@ -239,8 +239,11 @@
       {{end}}
     </table>
     {{end}}
-    <hr>
-    <p class="text-right">
+
+  <nav class="navbar navbar-default navbar-bottom">
+    <div class="container">
+      {{template "footerBoilerplate"}}
+      <p class="navbar-text navbar-right">
       Took {{.Stats.Duration}}{{if .Stats.Wait}}(queued: {{.Stats.Wait}}){{end}} for
       {{HumanUnit .Stats.IndexBytesLoaded}}B index data,
       {{.Stats.NgramMatches}} ngram matches,
@@ -248,7 +251,9 @@
       {{.Stats.FilesLoaded}} docs ({{HumanUnit .Stats.ContentBytesLoaded}}B)
       loaded{{if or .Stats.FilesSkipped .Stats.ShardsSkipped}},
       {{.Stats.FilesSkipped}} docs and {{.Stats.ShardsSkipped}} shards skipped{{else}}.{{end}}
-    </p>
+      </p>
+    </div>
+  </nav>
   </div>
   {{ template "jsdep"}}
 </body>
@@ -289,6 +294,15 @@
     </tbody>
     </ul>
   </div>
+
+  <nav class="navbar navbar-default navbar-bottom">
+    <div class="container">
+      {{template "footerBoilerplate"}}
+      <p class="navbar-text navbar-right">
+      </p>
+    </div>
+  </nav>
+
   {{ template "jsdep"}}
 </body>
 </html>
@@ -306,35 +320,57 @@
 	 <pre id="l{{Inc $index}}" class="inline-pre"><span class="noselect"><a href="#l{{Inc $index}}">{{Inc $index}}</a>: </span>{{$ln}}</pre>
        {{end}}
      </div>
-  </div>
-  {{ template "jsdep"}}
+  <nav class="navbar navbar-default navbar-bottom">
+    <div class="container">
+      {{template "footerBoilerplate"}}
+      <p class="navbar-text navbar-right">
+      </p>
+    </div>
+  </nav>
+  </div> 
+ {{ template "jsdep"}}
 </body>
 </html>
 `,
 
 	"about": `
-<head>
+
+<html>
+  {{template "head"}}
   <title>About <em>zoekt</em></title>
-</head>
 <body>
 
-<p>
-  This is <a href="http://github.com/google/zoekt"><em>zoekt</em> (IPA: /zukt/)</a>,
-  an open-source full text search engine. It's pronounced roughly as you would
-  pronounce "zooked" in English.
-</p>
 
-<p>
-Used {{HumanUnit .Stats.IndexBytes}} memory for
-{{.Stats.Documents}} documents ({{HumanUnit .Stats.ContentBytes}})
-from {{.Stats.Repos}} repositories.
-</p>
+  <div class="jumbotron">
+    <div class="container">
+      {{template "searchbox" .Last}}
+    </div>
+  </div>
 
-<p>
+  <div class="container">
+    <p>
+      This is <a href="http://github.com/google/zoekt"><em>zoekt</em> (IPA: /zukt/)</a>,
+      an open-source full text search engine. It's pronounced roughly as you would
+      pronounce "zooked" in English.
+    </p>
+    <p>
+    {{if .Version}}<em>Zoekt</em> version {{.Version}}, uptime{{else}}Uptime{{end}} {{.Uptime}}
+    </p>
 
-{{if .Version}}<em>Zoekt</em> version {{.Version}}, uptime{{else}}Uptime{{end}} {{.Uptime}}
+    <p>
+    Used {{HumanUnit .Stats.IndexBytes}} memory for
+    {{.Stats.Documents}} documents ({{HumanUnit .Stats.ContentBytes}})
+    from {{.Stats.Repos}} repositories.
+    </p>
+  </div>
 
-</p>
+  <nav class="navbar navbar-default navbar-bottom">
+    <div class="container">
+      {{template "footerBoilerplate"}}
+      <p class="navbar-text navbar-right">
+      </p>
+    </div>
+  </nav>
 `,
 }