diff --git a/lib/gollum/templates/navbar.mustache b/lib/gollum/templates/navbar.mustache
index 1020f436..d86e8c8c 100644
--- a/lib/gollum/templates/navbar.mustache
+++ b/lib/gollum/templates/navbar.mustache
@@ -1,106 +1,103 @@
-<nav class="actions pt-4 px-2 px-lg-0 overflow-x-scroll">
-  <div class="TableObject">
-    <div class="TableObject-item hide-lg hide-xl">
-      {{>mobilenav}}
-    </div>
+<nav class="TableObject actions pt-4 px-2 px-lg-0 overflow-x-scroll">
+  <div class="TableObject-item hide-lg hide-xl">
+    {{>mobilenav}}
+  </div>
 
-    <div class="TableObject-item hide-sm hide-md">
-      <a class="btn btn-sm" id="minibutton-home" href="{{page_route}}">
-        Home
-      </a>
-    </div>
+  <div class="TableObject-item hide-sm hide-md">
+    <a class="btn btn-sm" id="minibutton-home" href="{{page_route}}">
+      Home
+    </a>
+  </div>
 
-    <div
-      class="TableObject-item TableObject-item--primary px-2"
-      {{^search}}style="visibility:hidden"{{/search}}
-    >
-      {{>searchbar}}
-    </div>
+  <div
+    class="TableObject-item TableObject-item--primary px-2"
+    {{^search}}style="visibility:hidden"{{/search}}
+  >
+    {{>searchbar}}
+  </div>
 
-    <div class="TableObject-item hide-sm hide-md">
-      <div class="BtnGroup d-flex">
-        {{#overview}}
-          <a
-            class="btn BtnGroup-item btn-sm"
-            href="{{overview_path}}"
-            id="minibutton-overview"
+  <div class="TableObject-item hide-sm hide-md">
+    <div class="BtnGroup d-flex">
+      {{#overview}}
+        <a
+          class="btn BtnGroup-item btn-sm"
+          href="{{overview_path}}"
+          id="minibutton-overview"
+        >
+          Overview
+        </a>
+      {{/overview}}
+
+      {{#latest_changes}}
+        <a
+          class="btn BtnGroup-item btn-sm"
+          href="{{latest_changes_path}}"
+          id="minibutton-latest-changes"
+        >
+          Latest Changes
+        </a>
+      {{/latest_changes}}
+    </div>
+  </div>
+
+  <div class="TableObject-item px-2">
+    <div class="BtnGroup d-flex">
+      {{#history}}
+        <a
+          class="btn BtnGroup-item btn-sm hide-sm hide-md"
+          href="{{history_path}}/{{escaped_url_path}}"
+          id="minibutton-history"
+        >
+          History
+        </a>
+      {{/history}}
+
+      {{#allow_editing}}
+        {{#allow_uploads}}
+          <button
+            class="btn BtnGroup-item btn-sm hide-sm hide-md
+              minibutton-upload-page"
           >
-            Overview
-          </a>
-        {{/overview}}
+            Upload
+          </button>
+        {{/allow_uploads}}
 
-        {{#latest_changes}}
-          <a
-            class="btn BtnGroup-item btn-sm"
-            href="{{latest_changes_path}}"
-            id="minibutton-latest-changes"
+        {{#editable}}
+          <button
+            class="btn BtnGroup-item btn-sm hide-sm hide-md
+              minibutton-rename-page"
           >
-            Latest Changes
-          </a>
-        {{/latest_changes}}
-      </div>
-    </div>
-
-    <div class="TableObject-item px-2">
-      <div class="BtnGroup d-flex">
-        {{#history}}
+            Rename
+          </button>
           <a
             class="btn BtnGroup-item btn-sm hide-sm hide-md"
-            href="{{history_path}}/{{escaped_url_path}}"
-            id="minibutton-history"
+            href="{{edit_path}}/{{escaped_url_path}}"
+            id="minibutton-edit-page"
           >
-            History
+            Edit
           </a>
-        {{/history}}
-
-        {{#allow_editing}}
-          {{#allow_uploads}}
-            <a
-              class="btn BtnGroup-item btn-sm hide-sm hide-md
-                minibutton-upload-page"
-            >
-              Upload
-            </a>
-          {{/allow_uploads}}
-
-          {{#editable}}
-            <a
-              class="btn BtnGroup-item btn-sm hide-sm hide-md
-                minibutton-rename-page"
-            >
-              Rename
-            </a>
-            <a
-              class="btn BtnGroup-item btn-sm hide-sm hide-md"
-              href="{{edit_path}}/{{escaped_url_path}}"
-              id="minibutton-edit-page"
-            >
-              Edit
-            </a>
-          {{/editable}}
-        {{/allow_editing}}
-      </div>
+        {{/editable}}
+      {{/allow_editing}}
     </div>
+  </div>
 
+  {{#allow_editing}}
+    {{#editable}}
+      <div class="TableObject-item">
+        <a class="btn btn-primary btn-sm minibutton-new-page" href="#">
+          New
+        </a>
+      </div>
+    {{/editable}}
 
-    {{#allow_editing}}
-      {{#editable}}
+    {{^editable}}
+      {{#newable}}
         <div class="TableObject-item">
           <a class="btn btn-primary btn-sm minibutton-new-page" href="#">
             New
           </a>
         </div>
-      {{/editable}}
-
-      {{^editable}}
-        {{#newable}}
-          <div class="TableObject-item">
-            <a class="btn btn-primary btn-sm minibutton-new-page" href="#">
-              New
-            </a>
-          </div>
-        {{/newable}}
-      {{/editable}}
-    {{/allow_editing}}
-  </div>
+      {{/newable}}
+    {{/editable}}
+  {{/allow_editing}}
 </nav>