diff --git a/layouts/partials/page-footer.html b/layouts/partials/page-footer.html
index 383d49e..de88318 100644
--- a/layouts/partials/page-footer.html
+++ b/layouts/partials/page-footer.html
@@ -44,7 +44,7 @@
 
 
 <div class="gdoc-page__footer flex flex-wrap justify-between">
-    {{ $showPrevNext := (and (not .Site.Params.GeekdocNextPrev) .Site.Params.GeekdocMenuBundle) }}
+    {{ $showPrevNext := (and (default true .Site.Params.GeekdocNextPrev) .Site.Params.GeekdocMenuBundle) }}
     {{ if $showPrevNext }}
         <span>
             {{ with ($current.Scratch.Get "prevPage") }}
diff --git a/layouts/partials/page-header.html b/layouts/partials/page-header.html
index bd5900a..957674a 100644
--- a/layouts/partials/page-header.html
+++ b/layouts/partials/page-header.html
@@ -6,20 +6,20 @@
     {{ $.Scratch.Set "geekdocFilePath" false }}
 {{ end }}
 
-{{define "breadcrumb"}}
+{{ define "breadcrumb" }}
     {{$parent := .page.Parent }}
     {{ if $parent }}
         {{ $value := (printf "<a href='%s'>%s</a> / %s" $parent.RelPermalink $parent.Title .value) }}
         {{ template "breadcrumb" dict "page" $parent "value" $value }}
-    {{else}}
-        {{.value|safeHTML}}
-    {{end}}
-{{end}}
+    {{ else }}
+        {{ .value | safeHTML }}
+    {{ end }}
+{{ end }}
 
 <div class="gdoc-page__header flex flex-wrap justify-between{{ if not $geekdocRepo }} hidden-mobile{{ end }}" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
-    {{$showBreadcrumb := (and (not .Page.Params.geekdocBreadcrumb) (not .Site.Params.geekdocBreadcrumb))}}
+    {{ $showBreadcrumb := (and (default true .Page.Params.geekdocBreadcrumb) (default true .Site.Params.geekdocBreadcrumb)) }}
     <span>
-        {{if $showBreadcrumb}}
+        {{if $showBreadcrumb }}
             <span class="breadcrumb">
                 <svg class="icon path"><use xlink:href="#path"></use></svg>
                 {{ $name := (partial "title" .) }}