diff --git a/hugo_stats.json b/hugo_stats.json
index 8918945cfd..1d93441bba 100644
--- a/hugo_stats.json
+++ b/hugo_stats.json
@@ -394,7 +394,6 @@
       "mt-1",
       "mt-2",
       "mt-20",
-      "mt-4",
       "mx-auto",
       "my-0",
       "my-2",
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 3dd99e53c1..1629ee6933 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -24,6 +24,8 @@
         </button>
         <!-- Actual Sidebar Content -->
         {{ block "left" . }}
+          {{ partial "sidebar/mainnav.html" . }}
+          {{ partial "sidebar/sections.html" . }}
         {{ end }}
       </div>
     </div>
diff --git a/layouts/_default/cli.html b/layouts/_default/cli.html
index 964ba40544..347cce4099 100644
--- a/layouts/_default/cli.html
+++ b/layouts/_default/cli.html
@@ -1,7 +1,3 @@
-{{ define "left" }}
-  {{ partial "sidebar.html" . }}
-{{ end }}
-
 {{ define "main" }}
   {{ $data := "" }}
   {{ if .Params.datafolder }}
diff --git a/layouts/_default/glossary.html b/layouts/_default/glossary.html
index 06eb46c6bd..87c0ddf28d 100644
--- a/layouts/_default/glossary.html
+++ b/layouts/_default/glossary.html
@@ -1,5 +1,5 @@
 {{ define "left" }}
-  {{ partial "sidebar.html" . }}
+  {{ partial "sidebar/mainnav.html" . }}
 {{ end }}
 
 {{ define "main" }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index a2c3796d4c..934a6c2135 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,7 +1,3 @@
-{{ define "left" }}
-  {{ partial "sidebar.html" . }}
-{{ end }}
-
 {{ define "main" }}
   {{ partial "content-default.html" . }}
 {{ end }}
diff --git a/layouts/_default/search.html b/layouts/_default/search.html
index fdc7d46c7c..af069ba1b1 100644
--- a/layouts/_default/search.html
+++ b/layouts/_default/search.html
@@ -1,5 +1,5 @@
 {{ define "left" }}
-  {{ partial "sidebar.html" . }}
+  {{ partial "sidebar/mainnav.html" . }}
 {{ end }}
 
 {{ define "main" }}
diff --git a/layouts/_default/series.html b/layouts/_default/series.html
index 46af7e4c6a..498e05ec29 100644
--- a/layouts/_default/series.html
+++ b/layouts/_default/series.html
@@ -1,7 +1,3 @@
-{{ define "left" }}
-{{ partial "sidebar.html" . }}
-{{ end }}
-
 {{ define "main" }}
 {{ partial "breadcrumbs.html" . }}
 <article class="prose max-w-none dark:prose-invert">
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index a2c3796d4c..934a6c2135 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,7 +1,3 @@
-{{ define "left" }}
-  {{ partial "sidebar.html" . }}
-{{ end }}
-
 {{ define "main" }}
   {{ partial "content-default.html" . }}
 {{ end }}
diff --git a/layouts/_default/wide.html b/layouts/_default/wide.html
index ecf5a7406e..cbfb7cf394 100644
--- a/layouts/_default/wide.html
+++ b/layouts/_default/wide.html
@@ -1,9 +1,5 @@
-{{ define "left" }}
-  {{ partial "sidebar.html" . }}
-{{ end }}
-
 {{ define "main" }}
-  <article class="prose min-w-0 flex-[2_2_0%] max-w-4xl dark:prose-invert">
+<article class="prose min-w-0 flex-[2_2_0%] max-w-4xl dark:prose-invert">
     {{ partial "breadcrumbs.html" . }}
     <h1 data-pagefind-weight="10" class="scroll-mt-36">{{ .Title }}</h1>
     {{ if eq .CurrentSection.Layout "series" }}
diff --git a/layouts/learning-paths/list.html b/layouts/learning-paths/list.html
index 035eec5be2..16cff293c7 100644
--- a/layouts/learning-paths/list.html
+++ b/layouts/learning-paths/list.html
@@ -1,7 +1,3 @@
-{{ define "left" }}
-  {{- partial "sidebar.html" . }}
-{{ end }}
-
 {{ define "main" }}
   <article class="prose max-w-none dark:prose-invert">
     {{ partial "breadcrumbs.html" . }}
diff --git a/layouts/learning-paths/single.html b/layouts/learning-paths/single.html
index c0fe4e6828..5a51653658 100644
--- a/layouts/learning-paths/single.html
+++ b/layouts/learning-paths/single.html
@@ -12,7 +12,3 @@
     {{ partial "post-links.html" (where .CurrentSection.Pages "Permalink" "ne" page.Permalink) }}
   </article>
 {{ end }}
-
-{{ define "left" }}
-  {{- partial "sidebar.html" . }}
-{{ end }}
diff --git a/layouts/partials/sidebar-mainnav.html b/layouts/partials/sidebar/mainnav.html
similarity index 80%
rename from layouts/partials/sidebar-mainnav.html
rename to layouts/partials/sidebar/mainnav.html
index c73da7ce3d..204d52e4ee 100644
--- a/layouts/partials/sidebar-mainnav.html
+++ b/layouts/partials/sidebar/mainnav.html
@@ -1,13 +1,20 @@
 <!-- Main navigation for the sidebar -->
 <div class="py-2 px-4" x-data="{ expanded: false }">
   <div class="flex w-full items-center justify-between">
-    <a class="hover:text-blue-light dark:hover:text-blue-dark" href="{{ .FirstSection.Permalink }}">
-      {{- with .FirstSection.Params.icon }}
+    <!-- Current section: use menu, fall back to current page -->
+    {{- $curr := page }}
+    {{- range site.Menus.main }}
+      {{- if .Page.IsAncestor page }}
+        {{- $curr = .Page }}
+      {{- end }}
+    {{- end }}
+    <a class="hover:text-blue-light dark:hover:text-blue-dark" href="{{ $curr.Permalink }}">
+      {{- with $curr.Params.icon }}
         <span class="pr-2 icon-sm icon-svg">
           {{- partialCached "icon.html" . . -}}
         </span>
       {{- end }}
-      {{- .FirstSection.LinkTitle -}}
+      {{- $curr.LinkTitle -}}
     </a>
     <button @click="expanded = !expanded" class="rounded hover:bg-gray-light-300 hover:dark:bg-gray-dark-300">
       <span x-show="! expanded" class="icon-svg">
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar/sections.html
similarity index 98%
rename from layouts/partials/sidebar.html
rename to layouts/partials/sidebar/sections.html
index d71e0d1e77..693ebb4fcb 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar/sections.html
@@ -1,6 +1,4 @@
 <!-- section tree -->
-{{ partial "sidebar-mainnav.html" . }}
-
 <nav class="md:text-sm flex flex-col">
   <div
     class="block py-4 md:hidden text-gray-light dark:text-gray-dark">This section</div>
diff --git a/layouts/partials/sidebar-tags.html b/layouts/partials/sidebar/tags.html
similarity index 100%
rename from layouts/partials/sidebar-tags.html
rename to layouts/partials/sidebar/tags.html
diff --git a/layouts/samples/single.html b/layouts/samples/single.html
index 7c2fda62cb..695a3328c3 100644
--- a/layouts/samples/single.html
+++ b/layouts/samples/single.html
@@ -1,5 +1,6 @@
 {{ define "left" }}
-  {{ partial "sidebar.html" . }}
+  {{ partial "sidebar/mainnav.html" . }}
+  {{ partial "sidebar/sections.html" . }}
 {{ end }}
 
 {{ define "main" }}
diff --git a/layouts/tag/taxonomy.html b/layouts/tag/taxonomy.html
index c3acc38c4e..f0eafa8014 100644
--- a/layouts/tag/taxonomy.html
+++ b/layouts/tag/taxonomy.html
@@ -1,5 +1,6 @@
 {{ define "left" }}
-  {{ partial "sidebar-tags.html" . }}
+  {{ partial "sidebar/mainnav.html" . }}
+  {{ partial "sidebar/tags.html" . }}
 {{ end }}
 
 {{ define "main" }}
diff --git a/layouts/tag/term.html b/layouts/tag/term.html
index 4ca56aedd5..001e2d7ed0 100644
--- a/layouts/tag/term.html
+++ b/layouts/tag/term.html
@@ -1,5 +1,5 @@
 {{ define "left" }}
-  {{ partial "sidebar-tags.html" . }}
+  {{ partial "sidebar/tags.html" . }}
 {{ end }}
 
 {{ define "main" }}