diff --git a/assets/hb/modules/docs/scss/_content.scss b/assets/hb/modules/docs/scss/_content.scss
index 62bfb6e9..a56f2ae6 100644
--- a/assets/hb/modules/docs/scss/_content.scss
+++ b/assets/hb/modules/docs/scss/_content.scss
@@ -14,4 +14,8 @@
     h6 {
         margin-top: 0.5rem;
     }
+
+    :last-child {
+        margin-bottom: 0;
+    }
 }
diff --git a/layouts/docs/list.html b/layouts/docs/list.html
index 76d6977a..02b2c191 100644
--- a/layouts/docs/list.html
+++ b/layouts/docs/list.html
@@ -1,13 +1,11 @@
 {{- define "main" }}
   <div class="hb-docs">
-    <div class="hb-docs-sidebar hb-module" tabindex="-1" data-bs-hide="focusout">
+    <div class="hb-docs-sidebar" tabindex="-1" data-bs-hide="focusout">
       {{ partial "hb/modules/docs/nav" . }}
     </div>
     <div class="hb-docs-main col-12 col-xxl-10">
       {{ partial "hugopress/functions/render-hooks" (dict "Page" . "Name" "hb-docs-main-begin") }}
-      <div class="hb-module">
-        {{ partial "hb/modules/docs/section" . }}
-      </div>
+      {{ partial "hb/modules/docs/section" . }}
       {{ partial "hugopress/functions/render-hooks" (dict "Page" . "Name" "hb-docs-main-end") }}
     </div>
   </div>
diff --git a/layouts/docs/single.html b/layouts/docs/single.html
index 71746e94..f4d075a3 100644
--- a/layouts/docs/single.html
+++ b/layouts/docs/single.html
@@ -1,12 +1,12 @@
 {{- define "main" }}
   <div class="hb-docs">
-    <div class="hb-docs-sidebar hb-module" tabindex="-1" data-bs-hide="focusout">
+    <div class="hb-docs-sidebar" tabindex="-1" data-bs-hide="focusout">
       {{ partial "hb/modules/docs/nav" . }}
     </div>
     <div class="hb-docs-main">
       {{ partial "hugopress/functions/render-hooks" (dict "Page" . "Name" "hb-docs-main-begin") }}
-      <div class="hb-docs-doc hb-module">
-        <div class="hb-docs-doc-intro">
+      <div class="hb-docs-doc">
+        <div class="hb-docs-doc-intro hb-module">
           <h1 class="mb-3">{{ .Title }}</h1>
           <div class="hb-blog-post-meta hb-docs-doc-meta mb-3">
             {{- partial "hb/modules/docs/doc/meta" . }}
diff --git a/layouts/partials/hb/modules/docs/doc.html b/layouts/partials/hb/modules/docs/doc.html
index 63837263..c78b6ed4 100644
--- a/layouts/partials/hb/modules/docs/doc.html
+++ b/layouts/partials/hb/modules/docs/doc.html
@@ -1,6 +1,6 @@
 {{ partial "hugopress/functions/render-hooks" (dict "Page" . "Name" "hb-docs-doc-content-begin") }}
 {{- $attributes := partial "hugopress/functions/render-attributes" (dict "Page" . "Name" "hb-docs-doc-content") }}
-<div class="hb-docs-doc-content mb-5"{{ with $attributes }} {{ . | safeHTMLAttr }}{{ end }}>
+<div class="hb-docs-doc-content hb-module"{{ with $attributes }} {{ . | safeHTMLAttr }}{{ end }}>
   {{ .Content }}
 </div>
 {{ partial "hugopress/functions/render-hooks" (dict "Page" . "Name" "hb-docs-doc-content-end") }}
diff --git a/layouts/partials/hb/modules/docs/doc/comments.html b/layouts/partials/hb/modules/docs/doc/comments.html
index dfa7cf98..f3e29b3d 100644
--- a/layouts/partials/hb/modules/docs/doc/comments.html
+++ b/layouts/partials/hb/modules/docs/doc/comments.html
@@ -1,6 +1,6 @@
 {{- if default true .Params.comments }}
   {{ partial "hugopress/functions/render-hooks" (dict "Page" . "Name" "hb-docs-doc-comments-begin") }}
-  <div id="content-comments" class="hb-docs-doc-comments">
+  <div id="content-comments" class="hb-docs-doc-comments hb-module">
     {{ partial "hugopress/functions/render-hooks" (dict "Page" . "Name" "hb-docs-doc-comments") }}
   </div>
   {{ partial "hugopress/functions/render-hooks" (dict "Page" . "Name" "hb-docs-doc-comments-end") }}
diff --git a/layouts/partials/hb/modules/docs/nav.html b/layouts/partials/hb/modules/docs/nav.html
index 6efc75cf..19849c00 100644
--- a/layouts/partials/hb/modules/docs/nav.html
+++ b/layouts/partials/hb/modules/docs/nav.html
@@ -14,7 +14,7 @@ <h5 class="offcanvas-title" id="hb-docs-nav-label">
       data-bs-target=".hb-docs-nav"></button>
   </div>
   <div class="offcanvas-body flex-column text-body-secondary">
-    <ul class="hb-docs-nav-links list-unstyled">
+    <ul class="hb-docs-nav-links list-unstyled hb-module">
       {{ template "walk-docs-tree" (dict "Tree" $tree "Page" .) }}
     </ul>
   </div>
diff --git a/layouts/partials/hb/modules/docs/section.html b/layouts/partials/hb/modules/docs/section.html
index c3366243..a1f8c65b 100644
--- a/layouts/partials/hb/modules/docs/section.html
+++ b/layouts/partials/hb/modules/docs/section.html
@@ -1,9 +1,11 @@
-<h1 class="hb-docs-doc-title mb-3">{{ .Title }}</h1>
-{{- with .Description }}
-  <p class="lead">{{ . }}</p>
-{{- end }}
+<div class="hb-docs-doc-intro hb-module">
+  <h1 class="hb-docs-doc-title mb-0">{{ .Title }}</h1>
+  {{- with .Description }}
+    <p class="lead mt-3">{{ . }}</p>
+  {{- end }}
+</div>
 {{ partial "hugopress/functions/render-hooks" (dict "Page" . "Name" "hb-docs-doc-content-begin") }}
-<div class="hb-docs-doc-content mb-5">
+<div class="hb-docs-doc-content hb-module">
   {{ .Content }}
   {{- if .Pages }}
     <h2 class="mb-3">{{ i18n "in_this_section" }}</h2>
diff --git a/layouts/partials/hb/modules/docs/toc.html b/layouts/partials/hb/modules/docs/toc.html
index d7471ebb..f43cfa4e 100644
--- a/layouts/partials/hb/modules/docs/toc.html
+++ b/layouts/partials/hb/modules/docs/toc.html
@@ -1,5 +1,6 @@
 {{ partial "hugopress/functions/render-hooks" (dict "Page" . "Name" "hb-docs-doc-toc-begin") }}
 {{- if partial "base/functions/has-toc" . }}
+<div class="hb-module pb-1">
   <div class="h6 d-none d-md-block">{{ i18n "on_this_page" }}</div>
   <hr class="d-none d-md-block" />
   <div class="d-grid d-block d-md-none mb-2">
@@ -17,5 +18,6 @@
   <div class="px-2 px-md-0">
     <div id="collapse-toc" class="collapse hb-docs-doc-toc-collapse">{{ .TableOfContents }}</div>
   </div>
+</div>
 {{- end }}
 {{ partial "hugopress/functions/render-hooks" (dict "Page" . "Name" "hb-docs-doc-toc-end") }}
diff --git a/modules/doc-nav/layouts/partials/hb/modules/docs-doc-nav/index.html b/modules/doc-nav/layouts/partials/hb/modules/docs-doc-nav/index.html
index 99fd1470..e7c9c109 100644
--- a/modules/doc-nav/layouts/partials/hb/modules/docs-doc-nav/index.html
+++ b/modules/doc-nav/layouts/partials/hb/modules/docs-doc-nav/index.html
@@ -22,7 +22,7 @@
   {{- $justify = "justify-content-end" }}
 {{- end }}
 {{- $size := "1.5em" }}
-<ul class="hb-docs-doc-nav nav mb-3 {{ $justify }}">
+<ul class="hb-docs-doc-nav nav hb-module {{ $justify }}">
   {{ with $prev }}
     <li class="nav-item my-1">
       <a