diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index 14104ba570..1cd8887d77 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -31,7 +31,7 @@
               {{- $isSubHidden := or (.Params.hidden) (eq .Title "") }}
               {{- if or $isSubSelf $isSubAncestor }}
                 {{- partial "partials/inline/menu-walker" (dict "sect" . "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks "alwaysopen" $defaultAlwaysopen "isSelf" $isSubSelf "isAncestor" $isSubAncestor "isHidden" $isSubHidden ) }}
-              {{- else if not $isSubHidden }}
+              {{- else if and (not $isSubHidden) (or .Params.collapsibleMenu .Site.Params.collapsibleMenu (not .Parent.RelPermalink) (eq .Parent $currentNode) (.Parent.IsAncestor $currentNode)) }}
                 {{- partialCached "partials/inline/menu-walker" (dict "sect" . "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks "alwaysopen" $defaultAlwaysopen "isSelf" $isSubSelf "isAncestor" $isSubAncestor "isHidden" $isSubHidden) .Path }}
               {{- end }}
             {{- end }}
@@ -144,11 +144,13 @@
     {{- $title := partial "title.gotmpl" (dict "page" . "linkTitle" true) }}
     {{- $url := partial "permalink.gotmpl" (dict "to" .) }}
     {{- if $hasVisibleChildren }}
-      {{- $isCollapsible := or (.Params.collapsibleMenu | default .Site.Params.collapsibleMenu) (not $url) }}
+      {{- $isCollapsible := or .Params.collapsibleMenu .Site.Params.collapsibleMenu }}
       {{- $currentAlwaysopen := .Params.alwaysopen | default $alwaysopen }}
       {{- $pageId := md5 .Page }}
       {{- $isOpen := or $currentAlwaysopen $isSelf $isAncestor }}
-            <li class="{{if $isHidden }}hidden {{end}}{{if $isActive }}active {{end}}{{if (or $isSelf $isAncestor) }}parent {{end}}{{if $currentAlwaysopen}}alwaysopen {{end}}" data-nav-id="{{ $url }}">{{ if $isCollapsible }}<input type="checkbox" id="R-section-{{ $pageId }}" aria-controls="R-subsections-{{ $pageId }}"{{ if $isOpen }} checked{{ end }}><label for="R-section-{{ $pageId }}"><i class="fa-fw fas fa-chevron-down"></i><i class="fa-fw fas fa-chevron-right"></i><span class="a11y-only">{{ T "Submenu" $title }}</span></label>{{ end }}{{ if $url }}<a class="padding" href="{{ $url }}">{{ else }}<span class="padding">{{ end }}
+            <li class="{{if $isActive }}active {{end}}{{if (or $isSelf $isAncestor) }}parent {{end}}{{if $isHidden }}hidden {{end}}{{if not $url }}headless {{end}}{{if $currentAlwaysopen}}alwaysopen {{end}}" data-nav-id="{{ $url }}">
+      {{- if $isCollapsible }}<input type="checkbox" id="R-section-{{ $pageId }}" aria-controls="R-subsections-{{ $pageId }}"{{ if $isOpen }} checked{{ end }}><label for="R-section-{{ $pageId }}"><i class="fa-fw fas fa-chevron-down"></i><i class="fa-fw fas fa-chevron-right"></i><span class="a11y-only">{{ T "Submenu" $title }}</span></label>{{ end }}
+      {{- if $url }}<a class="padding" href="{{ $url }}">{{ else }}<span class="padding">{{ end }}
       {{- partial "menu-pre.html" . }}{{ $title }}{{ partial "menu-post.html" . }}
       {{- if $url }}{{ if $showvisitedlinks }}<i class="fa-fw fas fa-check read-icon"></i>{{ end }}</a>{{ else }}</span>{{ end }}<ul id="R-subsections-{{ $pageId }}" class="collapsible-menu">
       {{- $defaultAlwaysopen := .Site.Params.alwaysopen | default true }}
@@ -158,12 +160,13 @@
         {{- $isSubHidden := or (.Params.hidden) (eq .Title "") }}
         {{- if or $isSubSelf $isSubAncestor }}
           {{- partial "partials/inline/menu-walker" (dict "sect" . "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks "alwaysopen" $defaultAlwaysopen "isSelf" $isSubSelf "isAncestor" $isSubAncestor "isHidden" $isSubHidden) }}
-        {{- else if not $isSubHidden }}
+        {{- else if and (not $isSubHidden) (or .Params.collapsibleMenu .Site.Params.collapsibleMenu (not .Parent.RelPermalink) (eq .Parent $currentNode) (.Parent.IsAncestor $currentNode)) }}
           {{- partialCached "partials/inline/menu-walker" (dict "sect" . "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks "alwaysopen" $defaultAlwaysopen "isSelf" $isSubSelf "isAncestor" $isSubAncestor "isHidden" $isSubHidden) .Path }}
         {{- end }}
       {{- end }}</ul></li>
     {{- else }}
-            <li class="{{if $isHidden }}hidden {{end}}{{if $isActive }}active {{end}}" data-nav-id="{{ $url }}">{{ if $url }}<a class="padding" href="{{ $url }}">{{ else }}<span class="padding">{{ end }}
+            <li class="{{if $isActive }}active {{end}}{{if $isHidden }}hidden {{end}}{{if not $url }}headless {{end}}" data-nav-id="{{ $url }}">
+      {{- if $url }}<a class="padding" href="{{ $url }}">{{ else }}<span class="padding">{{ end }}
       {{- partial "menu-pre.html" . }}{{ $title }}{{ partial "menu-post.html" . }}
       {{- if $url }}{{ if $showvisitedlinks }}<i class="fa-fw fas fa-check read-icon"></i>{{ end }}</a>{{ else }}</span>{{ end }}</li>
     {{- end }}
diff --git a/layouts/partials/relearn-meta.gotmpl b/layouts/partials/relearn-meta.gotmpl
index e7021b0811..c89e54edba 100644
--- a/layouts/partials/relearn-meta.gotmpl
+++ b/layouts/partials/relearn-meta.gotmpl
@@ -13,10 +13,12 @@ section: {{- .Section }}
 {{- $currentNode.Scratch.Delete "relearnIsSelfFound"  }}
 {{- $currentNode.Scratch.Delete "relearnPrevPage"     }}
 {{- $currentNode.Scratch.Delete "relearnNextPage"     }}
-{{- template "relearn-structure" dict "node" .Site.Home "currentnode" $currentNode "hiddenstem" false "hiddencurrent" false }}
-{{- if not ($currentNode.Scratch.Get "relearnIsSelfFound") }}
-	{{- if not $currentNode.IsHome }}
-		{{- $currentNode.Scratch.Set "relearnPrevPage" .Site.Home }}
+{{- if (and (not .Params.disableNextPrev) (not .Site.Params.disableNextPrev)) }}
+	{{- template "relearn-structure" dict "node" .Site.Home "currentnode" $currentNode "hiddenstem" false "hiddencurrent" false }}
+	{{- if not ($currentNode.Scratch.Get "relearnIsSelfFound") }}
+		{{- if not $currentNode.IsHome }}
+			{{- $currentNode.Scratch.Set "relearnPrevPage" .Site.Home }}
+		{{- end }}
 	{{- end }}
 {{- end }}
 
@@ -44,16 +46,17 @@ section: {{- .Section }}
 				{{- $currentNode.Scratch.Set "relearnPrevPage" .node }}
 			{{- else if and $isPostSelf .node.RelPermalink (eq ($currentNode.Scratch.Get "relearnNextPage") nil) }}
 				{{- $currentNode.Scratch.Set "relearnNextPage" .node }}
-				{{- return }}
 			{{- end }}
 		{{- end }}
 	{{- end }}
 
-	{{- $pages := partialCached "_relearn/pages.gotmpl" (dict "page" .node) .node.Path }}
-	{{- range $pages }}
-		{{- template "relearn-structure" dict "node" . "currentnode" $currentNode "hiddenstem" $hidden_stem "hiddencurrent" $hidden_from_current }}
-		{{- if $currentNode.Scratch.Get "relearnNextPage" }}
-			{{- return }}
+	{{- if not ($currentNode.Scratch.Get "relearnNextPage") }}
+		{{- $pages := partialCached "_relearn/pages.gotmpl" (dict "page" .node) .node.Path }}
+		{{- range $pages }}
+			{{- template "relearn-structure" dict "node" . "currentnode" $currentNode "hiddenstem" $hidden_stem "hiddencurrent" $hidden_from_current }}
+			{{- if $currentNode.Scratch.Get "relearnNextPage" }}
+				{{- break }}
+			{{- end }}
 		{{- end }}
 	{{- end }}
 {{- end }}
\ No newline at end of file