diff --git a/layouts/_default/cli.html b/layouts/_default/cli.html
index 339d431719..ade1e78566 100644
--- a/layouts/_default/cli.html
+++ b/layouts/_default/cli.html
@@ -12,8 +12,10 @@
   {{ .Scratch.Set "headings" slice }}
   {{ .Scratch.Set "subheadings" slice }}
   {{ partial "breadcrumbs.html" . }}
-  <article class="prose max-w-none dark:prose-invert">
-    <h1>{{ .Title }}</h1>
+  <article class="DocSearch-content prose max-w-none dark:prose-invert">
+    {{ with .Title }}
+    <h1 id="{{ anchorize . }}">{{ . }}</h1>
+    {{ end }}
     {{ $data.short | .RenderString (dict "display" "block") }}
     {{ if $data.deprecated }}
       <blockquote class="warning">
diff --git a/layouts/_default/glossary.html b/layouts/_default/glossary.html
index f234aeb014..5d2bfb714c 100644
--- a/layouts/_default/glossary.html
+++ b/layouts/_default/glossary.html
@@ -4,8 +4,10 @@
 
 {{ define "main" }}
   {{ partial "breadcrumbs.html" . }}
-  <article class="prose max-w-none dark:prose-invert">
-    <h1>{{ .Title }}</h1>
+  <article class="DocSearch-content prose max-w-none dark:prose-invert">
+    {{ with .Title }}
+    <h1 id="{{ anchorize . }}">{{ . }}</h1>
+    {{ end }}
     <table>
       <thead>
         <tr>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 9a121cf298..334ad4e41c 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -4,9 +4,9 @@
 
 {{ define "main" }}
   {{ partial "breadcrumbs.html" . }}
-  <article class="prose max-w-none dark:prose-invert">
+  <article class="DocSearch-content prose max-w-none dark:prose-invert">
     {{ with .Title }}
-    <h1>{{ . }}</h1>
+    <h1 id="{{ anchorize . }}">{{ . }}</h1>
     {{ end }}
     {{ .Content }}
   </article>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 9a121cf298..334ad4e41c 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -4,9 +4,9 @@
 
 {{ define "main" }}
   {{ partial "breadcrumbs.html" . }}
-  <article class="prose max-w-none dark:prose-invert">
+  <article class="DocSearch-content prose max-w-none dark:prose-invert">
     {{ with .Title }}
-    <h1>{{ . }}</h1>
+    <h1 id="{{ anchorize . }}">{{ . }}</h1>
     {{ end }}
     {{ .Content }}
   </article>
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 795392d1b1..12a57fe51a 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -53,10 +53,10 @@
 {{ $isCurrent := eq (urls.Parse $ctx.Permalink).Path .entry.path }}
 <li class="pl-4 sidebar-hover rounded
   {{ if $isCurrent }} bg-gray-light-200 dark:bg-gray-dark-200{{ end }}">
-  <span class="flex items-center">
-    <a {{ if $isCurrent }}aria-current="page" {{ end }} class="py-2 w-full truncate"
-      href="{{ .entry.path }}" title="{{ markdownify .entry.title }}">{{ markdownify .entry.title }}</a>
-  </span>
+  <a {{ if $isCurrent }}aria-current="page" {{ end }} class="py-2 w-full truncate block"
+      href="{{ .entry.path }}" title="{{ markdownify .entry.title }}"
+      ><span>{{ markdownify .entry.title }}</span>
+  </a>
 </li>
 {{ end }}
 {{ end }}
diff --git a/layouts/samples/single.html b/layouts/samples/single.html
index 437e7c7c59..839f7f33df 100644
--- a/layouts/samples/single.html
+++ b/layouts/samples/single.html
@@ -4,8 +4,10 @@
 
 {{ define "main" }}
   {{ partial "breadcrumbs.html" . }}
-  <article class="prose max-w-none dark:prose-invert">
-    <h1>{{ .Title }}</h1>
+  <article class="DocSearch-content prose max-w-none dark:prose-invert">
+    {{ with .Title }}
+    <h1 id="{{ anchorize . }}">{{ . }}</h1>
+    {{ end }}
     <blockquote>
       <p><strong>Note</strong></p>
       <p>