--- a/static/tpl/nav.html	Wed Dec 11 21:51:51 2013 -0800
+++ b/static/tpl/nav.html	Thu Dec 12 21:54:04 2013 -0800
@@ -1,16 +1,34 @@
-<section>
-    <a href="/">Home</a>
-    {{#ifneq action to='read'}}<a href="{{url_read}}">Read</a>{{/ifneq}}
-    {{#ifneq action to='edit'}}<a href="{{url_edit}}">Edit</a>{{/ifneq}}
-    {{#ifneq action to='history'}}<a href="{{url_hist}}">History</a>{{/ifneq}}
-    <form id="search" class="form-search">
-        <input type="text" name="q" class="input-medium search-query" placeholder="Search...">
-        <button type="submit" class="btn btn-small">Search</button>
-    </form>
-    {{#if username}}
-    <a href="{{url_profile}}">{{username}}</a>
-    <a href="{{url_logout}}">Logout</a>
-    {{else}}
-    <a href="{{url_login}}">Login</a>
-    {{/if}}
-</section>
+<nav class="navbar" role="navigation">
+    <div class="navbar-header">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#wikked-navbar-collapse">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+        </button>
+        <a class="navbar-brand" href="/">Home</a>
+    </div>
+
+    <div class="collapse navbar-collapse" id="wikked-navbar-collapse">
+        <ul class="nav navbar-nav">
+            {{#ifneq action to='read'}}<li><a href="{{url_read}}">Read</a></li>{{/ifneq}}
+            {{#ifneq action to='edit'}}<li><a href="{{url_edit}}">Edit</a></li>{{/ifneq}}
+            {{#ifneq action to='history'}}<li><a href="{{url_hist}}">History</a></li>{{/ifneq}}
+        </ul>
+        <form role="search" id="search" class="navbar-form navbar-left">
+            <div class="form-group">
+                <label class="sr-only" for="search-query">Search query</label>
+                <input type="text" name="q" id="search-query" class="form-control input-sm" placeholder="Search...">
+            </div>
+            <button type="submit" class="btn btn-sm btn-default">Search</button>
+        </form>
+        <ul class="nav navbar-nav navbar-right">
+            {{#if username}}
+            <li><a href="{{url_profile}}">{{username}}</a></li>
+            <li><a href="{{url_logout}}">Logout</a></li>
+            {{else}}
+            <li><a href="{{url_login}}">Login</a></li>
+            {{/if}}
+        </ul>
+    </div>
+</nav>