diff --git a/README.md b/README.md
index aa3264e..9926c35 100644
--- a/README.md
+++ b/README.md
@@ -225,6 +225,15 @@ To customise a layout included in the zen theme, copy it to the root layout dire
 Add any new layouts to the root layout directory as well. This way they will not be overwritten when updating the theme.
 
 
+#### Menu and sidebar layouts
+
+The default menu will automatically have entries for the home page, each root page and each section, in that order.
+
+If the default sidebar is activated it will display each section with all its pages listed below.
+
+They are set up in `layouts/partials/menu.html`, `layouts/partials/mobilmenu.html` and `layouts/partials/sidebar.html`. The default works nicely for small sites but in many cases they will need to be customised.
+
+
 ### Styles and scripts
 
 Styles and scripts are processed with Hugo pipes that was added in Hugo 0.46.
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index 8515210..ce87e58 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -1,17 +1,14 @@
-{{ $home := relLangURL "/" -}}
 {{ $currentSection := .Section -}}
 {{ $currentID := "" -}}
 {{ with .File }}{{ $currentID = .UniqueID }}{{ end -}}
 <nav class="main-menu layout__navigation">
 <h2 class="visually-hidden">{{ i18n "menu_title" }}</h2>
 <ul class="navbar">
-<li><a class="{{ if .IsHome }}active{{ end }}" href="{{ $home }}">{{ i18n "menu_home" }}</a></li>
-{{ range where .Site.Pages "Section" "" -}}
-{{ if ne .RelPermalink (string $home) -}}
+{{ with .Site.Home }}<li><a class="{{ if eq $currentID .File.UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ i18n "menu_home" }}</a></li>{{ end }}
+{{ range where .Site.RegularPages "Section" "" -}}
 <li><a class="{{ if eq $currentID .File.UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></li>
 {{ end -}}
-{{ end -}}
-{{ range $.Site.Home.Sections -}}
+{{ range .Site.Sections -}}
 <li><a class="{{ if eq $currentSection .Section }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></li>
 {{ end -}}
 </ul>
diff --git a/layouts/partials/mobilemenu.html b/layouts/partials/mobilemenu.html
index 3a38855..1d7d892 100644
--- a/layouts/partials/mobilemenu.html
+++ b/layouts/partials/mobilemenu.html
@@ -1,4 +1,3 @@
-{{ $home := relLangURL "/" -}}
 {{ $currentSection := .Section -}}
 {{ $currentID := "" -}}
 {{ with .File }}{{ $currentID = .UniqueID }}{{ end -}}
@@ -13,13 +12,11 @@
     <nav class="mobile-nav__main-menu">
     <h2 class="visually-hidden">{{ i18n "menu_title" }}</h2>
     <ul class="mobile-nav__navbar">
-    <li><a class="{{ if .IsHome }}active{{ end }}" href="{{ $home }}">{{ i18n "menu_home" }}</a></li>
-    {{ range where .Site.Pages "Section" "" -}}
-    {{ if ne .RelPermalink (string $home) -}}
+    {{ with .Site.Home }}<li><a class="{{ if eq $currentID .File.UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ i18n "menu_home" }}</a></li>{{ end }}
+    {{ range where .Site.RegularPages "Section" "" -}}
     <li><a class="{{ if eq $currentID .File.UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></li>
     {{ end -}}
-    {{ end -}}
-    {{ range $.Site.Home.Sections -}}
+    {{ range .Site.Sections -}}
     <li><a class="{{ if eq $currentSection .Section }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></li>
     {{ end -}}
     </ul>
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 88e6297..50b539c 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -2,7 +2,7 @@
 {{ $currentID := "" -}}
 {{ with .File }}{{ $currentID = .UniqueID }}{{ end -}}
 <aside class="sidebar layout__second-sidebar">
-{{ range $.Site.Home.Sections -}}
+{{ range .Site.Sections -}}
 <section>
 <h4 class="menu"><a class="{{ if eq $currentSection .Section }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></h4>
 <ul class="menu">