diff --git a/web/templates/admin/campsite/form.gohtml b/web/templates/admin/campsite/form.gohtml
index df92e7d..f3c768a 100644
--- a/web/templates/admin/campsite/form.gohtml
+++ b/web/templates/admin/campsite/form.gohtml
@@ -13,7 +13,6 @@
 
 {{ define "content" -}}
     {{- /*gotype: dev.tandem.ws/tandem/camper/pkg/campsite.campsiteForm*/ -}}
-    {{ template "settings-tabs" "campsites" }}
     <form
             {{ if .ID }}
                 data-hx-put="/admin/campsites/{{ .CurrentLabel }}"
diff --git a/web/templates/admin/campsite/index.gohtml b/web/templates/admin/campsite/index.gohtml
index 5fd7161..2867f00 100644
--- a/web/templates/admin/campsite/index.gohtml
+++ b/web/templates/admin/campsite/index.gohtml
@@ -8,7 +8,6 @@
 
 {{ define "content" -}}
     {{- /*gotype: dev.tandem.ws/tandem/camper/pkg/campsite.campsiteIndex*/ -}}
-    {{ template "settings-tabs" "campsites" }}
     <a href="/admin/campsites/new">{{( pgettext "Add Campsite" "action" )}}</a>
     <h2>{{( pgettext "Campsites" "title" )}}</h2>
     {{ template "campground_map.svg" }}
diff --git a/web/templates/admin/campsite/type/form.gohtml b/web/templates/admin/campsite/type/form.gohtml
index 43a5d5e..f17143c 100644
--- a/web/templates/admin/campsite/type/form.gohtml
+++ b/web/templates/admin/campsite/type/form.gohtml
@@ -13,7 +13,6 @@
 
 {{ define "content" -}}
     {{- /*gotype: dev.tandem.ws/tandem/camper/pkg/campsite/types.typeForm*/ -}}
-    {{ template "settings-tabs" "campsiteTypes" }}
     <form
             {{ if .Slug }}
                 data-hx-put="/admin/campsites/types/{{ .Slug }}"
diff --git a/web/templates/admin/campsite/type/index.gohtml b/web/templates/admin/campsite/type/index.gohtml
index 4375893..6b3aff2 100644
--- a/web/templates/admin/campsite/type/index.gohtml
+++ b/web/templates/admin/campsite/type/index.gohtml
@@ -8,7 +8,6 @@
 
 {{ define "content" -}}
     {{- /*gotype: dev.tandem.ws/tandem/camper/pkg/campsite/types.typeIndex*/ -}}
-    {{ template "settings-tabs" "campsiteTypes" }}
     <a href="/admin/campsites/types/new">{{( pgettext "Add Type" "action" )}}</a>
     <h2>{{( pgettext "Campsite Types" "title" )}}</h2>
     {{ if .Types -}}
diff --git a/web/templates/admin/campsite/type/l10n.gohtml b/web/templates/admin/campsite/type/l10n.gohtml
index a77178c..13f5d11 100644
--- a/web/templates/admin/campsite/type/l10n.gohtml
+++ b/web/templates/admin/campsite/type/l10n.gohtml
@@ -9,7 +9,6 @@
 
 {{ define "content" -}}
     {{- /*gotype: dev.tandem.ws/tandem/camper/pkg/campsite/types.typeL10nForm*/ -}}
-    {{ template "settings-tabs" "campsiteTypes" }}
     <form data-hx-put="/admin/campsites/types/{{ .Slug }}/{{ .Locale.Language }}">
         <h2>
             {{printf (pgettext "Translate Campsite Type to %s" "title") .Locale.Endonym }}
diff --git a/web/templates/admin/carousel/form.gohtml b/web/templates/admin/carousel/form.gohtml
index 96130d7..e31a0b9 100644
--- a/web/templates/admin/carousel/form.gohtml
+++ b/web/templates/admin/carousel/form.gohtml
@@ -13,7 +13,6 @@
 
 {{ define "content" -}}
     {{- /*gotype: dev.tandem.ws/tandem/camper/pkg/carousel.slideForm*/ -}}
-    {{ template "settings-tabs" .CarouselName }}
     <form
             {{ if .ID }}
                 data-hx-put="/admin/{{ .CarouselName }}/slides/{{ .ID }}"
diff --git a/web/templates/admin/carousel/l10n.gohtml b/web/templates/admin/carousel/l10n.gohtml
index 12bc904..81cbe12 100644
--- a/web/templates/admin/carousel/l10n.gohtml
+++ b/web/templates/admin/carousel/l10n.gohtml
@@ -9,7 +9,6 @@
 
 {{ define "content" -}}
     {{- /*gotype: dev.tandem.ws/tandem/camper/pkg/home.slideL10nForm*/ -}}
-    {{ template "settings-tabs" "campsiteTypes" }}
     <form data-hx-put="/admin/home/slides/{{ .ID }}/{{ .Locale.Language }}">
         <h2>
             {{printf (pgettext "Translate Carousel Slide to %s" "title") .Locale.Endonym }}
diff --git a/web/templates/admin/home/index.gohtml b/web/templates/admin/home/index.gohtml
index 6ea7c58..b2872cf 100644
--- a/web/templates/admin/home/index.gohtml
+++ b/web/templates/admin/home/index.gohtml
@@ -8,7 +8,6 @@
 
 {{ define "content" -}}
     {{- /*gotype: dev.tandem.ws/tandem/camper/pkg/home.homeIndex*/ -}}
-    {{ template "settings-tabs" "home" }}
     <h2>{{( pgettext "Carousel" "title" )}}</h2>
     <a href="/admin/home/slides/new">{{( pgettext "Add slide" "action" )}}</a>
     {{ if .Slides -}}
diff --git a/web/templates/admin/htmx.gohtml b/web/templates/admin/htmx.gohtml
index 9b0205d..a632f57 100644
--- a/web/templates/admin/htmx.gohtml
+++ b/web/templates/admin/htmx.gohtml
@@ -4,4 +4,3 @@
 -->
 <title>{{ template "title" . }} — Camper</title>
 {{ template "content" . }}
-{{ define "settings-tabs" }}{{ end }}
diff --git a/web/templates/admin/layout.gohtml b/web/templates/admin/layout.gohtml
index 7d6fffb..02401d4 100644
--- a/web/templates/admin/layout.gohtml
+++ b/web/templates/admin/layout.gohtml
@@ -32,6 +32,24 @@
                         <li class="icon_company">
                             <a href="/admin/company">{{( pgettext "Company Settings" "title" )}}</a>
                         </li>
+                        <li>
+                            <a href="/admin/campsites/types">{{( pgettext "Campsite Types" "title" )}}</a>
+                        </li>
+                        <li>
+                            <a href="/admin/campsites">{{( pgettext "Campsites" "title" )}}</a>
+                        </li>
+                        <li>
+                            <a href="/admin/seasons">{{( pgettext "Seasons" "title" )}}</a>
+                        </li>
+                        <li>
+                            <a href="/admin/media">{{( pgettext "Media" "title" )}}</a>
+                        </li>
+                        <li>
+                            <a href="/admin/home">{{( pgettext "Home Page" "title" )}}</a>
+                        </li>
+                        <li>
+                            <a href="/admin/services">{{( pgettext "Services Page" "title" )}}</a>
+                        </li>
                     {{- end }}
                     <li class="icon_logout">
                         <button data-hx-delete="/me/session" data-hx-headers='{ {{ CSRFHeader }} }'
@@ -59,31 +77,3 @@
 </main>
 </body>
 </html>
-
-{{ define "settings-tabs" -}}
-    <nav>
-        <ul>
-            <li>
-                <a {{ if ne . "taxDetails" }}href="/admin/company"{{ end }}>{{( pgettext "Tax Details" "title" )}}</a>
-            </li>
-            <li>
-                <a {{ if ne . "campsiteTypes" }}href="/admin/campsites/types"{{ end }}>{{( pgettext "Campsite Types" "title" )}}</a>
-            </li>
-            <li>
-                <a {{ if ne . "campsites"}}href="/admin/campsites"{{ end }}>{{( pgettext "Campsites" "title" )}}</a>
-            </li>
-            <li>
-                <a {{ if ne . "seasons"}}href="/admin/seasons"{{ end }}>{{( pgettext "Seasons" "title" )}}</a>
-            </li>
-            <li>
-                <a {{ if ne . "home"}}href="/admin/home"{{ end }}>{{( pgettext "Home Page" "title" )}}</a>
-            </li>
-            <li>
-                <a {{ if ne . "services"}}href="/admin/services"{{ end }}>{{( pgettext "Services Page" "title" )}}</a>
-            </li>
-            <li>
-                <a {{ if ne . "media"}}href="/admin/media"{{ end }}>{{( pgettext "Media" "title" )}}</a>
-            </li>
-        </ul>
-    </nav>
-{{- end }}
diff --git a/web/templates/admin/media/form.gohtml b/web/templates/admin/media/form.gohtml
index 9091ca6..b255108 100644
--- a/web/templates/admin/media/form.gohtml
+++ b/web/templates/admin/media/form.gohtml
@@ -8,7 +8,6 @@
 
 {{ define "content" -}}
     {{- /*gotype: dev.tandem.ws/tandem/camper/pkg/media.mediaForm*/ -}}
-    {{ template "settings-tabs" "media" }}
     <form id="upload" enctype="multipart/form-data" data-hx-put="/admin/media/{{ .ID }}">
         <h2>{{( pgettext "Edit Media" "title" )}}</h2>
         <img src="{{ .Path }}" alt="">
diff --git a/web/templates/admin/media/index.gohtml b/web/templates/admin/media/index.gohtml
index c896102..c204e7b 100644
--- a/web/templates/admin/media/index.gohtml
+++ b/web/templates/admin/media/index.gohtml
@@ -8,7 +8,6 @@
 
 {{ define "content" -}}
     {{- /*gotype: dev.tandem.ws/tandem/camper/pkg/media.mediaIndex*/ -}}
-    {{ template "settings-tabs" "media" }}
     <h2>{{( pgettext "Media" "title" )}}</h2>
     <a href="/admin/media/upload">{{( pgettext "Upload media" "action" )}}</a>
     {{ if .Media -}}
diff --git a/web/templates/admin/media/upload.gohtml b/web/templates/admin/media/upload.gohtml
index 9ca721e..1102aad 100644
--- a/web/templates/admin/media/upload.gohtml
+++ b/web/templates/admin/media/upload.gohtml
@@ -8,7 +8,6 @@
 
 {{ define "content" -}}
     {{- /*gotype: dev.tandem.ws/tandem/camper/pkg/media.uploadForm*/ -}}
-    {{ template "settings-tabs" "media" }}
     <form id="mediaUpload" enctype="multipart/form-data" action="/admin/media" method="post" data-hx-boost="true">
         <h2>{{( pgettext "Upload Media" "title" )}}</h2>
         {{ CSRFInput }}
diff --git a/web/templates/admin/season/form.gohtml b/web/templates/admin/season/form.gohtml
index 434dd5f..b14e66f 100644
--- a/web/templates/admin/season/form.gohtml
+++ b/web/templates/admin/season/form.gohtml
@@ -13,7 +13,6 @@
 
 {{ define "content" -}}
     {{- /*gotype: dev.tandem.ws/tandem/camper/pkg/season.seasonForm*/ -}}
-    {{ template "settings-tabs" "seasons" }}
     <form
             {{ if .Slug }}
                 data-hx-put="/admin/seasons/{{ .Slug }}"
diff --git a/web/templates/admin/season/index.gohtml b/web/templates/admin/season/index.gohtml
index 15a3b1a..a3187f4 100644
--- a/web/templates/admin/season/index.gohtml
+++ b/web/templates/admin/season/index.gohtml
@@ -8,7 +8,6 @@
 
 {{ define "content" -}}
     {{- /*gotype: dev.tandem.ws/tandem/camper/pkg/season.seasonIndex*/ -}}
-    {{ template "settings-tabs" "seasons" }}
     <a href="/admin/seasons/new">{{( pgettext "Add Season" "action" )}}</a>
     <h2>{{( pgettext "Seasons" "title" )}}</h2>
     {{ if .Seasons -}}
diff --git a/web/templates/admin/services/index.gohtml b/web/templates/admin/services/index.gohtml
index 2e8751f..6c2d244 100644
--- a/web/templates/admin/services/index.gohtml
+++ b/web/templates/admin/services/index.gohtml
@@ -8,7 +8,6 @@
 
 {{ define "content" -}}
     {{- /*gotype: dev.tandem.ws/tandem/camper/pkg/services.servicesIndex*/ -}}
-    {{ template "settings-tabs" "services" }}
     <h2>{{( pgettext "Carousel" "title" )}}</h2>
     <a href="/admin/services/slides/new">{{( pgettext "Add slide" "action" )}}</a>
     {{ if .Slides -}}
diff --git a/web/templates/admin/taxDetails.gohtml b/web/templates/admin/taxDetails.gohtml
index 406d109..2405687 100644
--- a/web/templates/admin/taxDetails.gohtml
+++ b/web/templates/admin/taxDetails.gohtml
@@ -8,7 +8,6 @@
 
 {{ define "content" -}}
     {{- /*gotype: dev.tandem.ws/tandem/camper/pkg/company.taxDetailsForm*/ -}}
-    {{ template "settings-tabs" "taxDetails" }}
     <form data-hx-put="/admin/company">
         <h2>{{( pgettext "Tax Details" "title" )}}</h2>
         {{ CSRFInput }}