diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar/index.html
similarity index 73%
rename from layouts/partials/navbar.html
rename to layouts/partials/navbar/index.html
index 9830011..3450661 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar/index.html
@@ -10,17 +10,13 @@
           {{ $children := where $valid_children ".Parent.UniqueID" .UniqueID }}
           {{ $children := where $children ".Params.hide_in_nav" "!=" "true" }}
           <li class="top-level">
-            <a href="{{ .Permalink }}">{{ .LinkTitle }}</a>
+            {{ partial "navbar/link-item.html" . }}
             {{ if $children }}
               <ul>
                 {{ range first .Site.Params.nav_items $children }}
                   <li>
-                    <a href="{{ .Permalink }}">{{ .LinkTitle }}</a>
-                    <ul>
-                      {{ range .Pages }}
-                      <li><a href="{{ .Permalink }}">{{ .LinkTitle }}</a></li>
-                      {{ end }}
-                    </ul>
+                    {{ partial "navbar/link-item.html" . }}
+                    <ul>{{ range .Pages }}<li>{{ partial "navbar/link-item.html" . }}</li>{{ end }}</ul>
                   </li>
                 {{ end }}
                 {{ if ge (len $children) .Site.Params.nav_items }}
@@ -33,9 +29,7 @@
       {{ end }}
 
       {{ range where .Site.Pages.ByTitle "Kind" "page" }}
-        {{ if eq .Section "" }}
-          <li class="top-level"><a href="{{ .Permalink }}">{{ title .LinkTitle }}</a></li>
-        {{ end }}
+        {{ if eq .Section "" }}<li class="top-level">{{ partial "navbar/link-item.html" . }}</li>{{ end }}
       {{ end }}
       <li class="top-level"><a class="show-mobile" href="/">Home</a></li>
     </ul>
diff --git a/layouts/partials/navbar/link-item.html b/layouts/partials/navbar/link-item.html
new file mode 100644
index 0000000..10bb61b
--- /dev/null
+++ b/layouts/partials/navbar/link-item.html
@@ -0,0 +1 @@
+<a href="{{ .Permalink }}">{{ .LinkTitle }}</a>
diff --git a/layouts/partials/page_start.html b/layouts/partials/page_start.html
index b4b3ed1..4acac65 100644
--- a/layouts/partials/page_start.html
+++ b/layouts/partials/page_start.html
@@ -7,5 +7,5 @@
 {{ else }}
   <body>
 {{ end }}
-  {{ partial "navbar.html" . }}
+  {{ partial "navbar/index.html" . }}
   <div id="page-wrapper">
