diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index af71671..45246d7 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -5,14 +5,11 @@
 <h2 class="visually-hidden">Main menu</h2>
 <ul class="navbar clearfix">
 <li><a class="{{ if .IsHome }}active{{ end }}" href="/">Home</a></li>
-{{ range $section, $taxonomy := .Site.Sections -}}
-{{ if eq $section "" -}}
-{{ range $taxonomy.Pages -}}
-<li><a class="{{ if eq $currentID .UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li>
-{{ end -}}
-{{ else -}}
-<li><a class="{{ if eq $currentSection $section }}active{{ end }}" href="/{{ urlize $section }}">{{ humanize $section }}</a></li>
+{{ range after 1 (where .Site.Pages "Section" "") -}}
+<li><a class="{{ if eq $currentID .UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></li>
 {{ end -}}
+{{ range $.Site.Home.Sections -}}
+<li><a class="{{ if eq $currentSection .Section }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></li>
 {{ end -}}
 </ul>
 </nav>
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 15539f2..a5a2ff2 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -1,16 +1,13 @@
-{{ $currentSection := .Section }}
 {{ $currentID := .UniqueID }}
 <aside class="layout-3col__right-sidebar" role="complementary">
-{{ range $section, $taxonomy := .Site.Sections -}}
-{{ if ne $section "" -}}
+{{ range $.Site.Home.Sections -}}
 <section>
-<h4 class="menu"><a class="{{ if eq $currentSection $section }}active{{ end }}" href="/{{ urlize $section }}">{{ humanize $section }}</a></h4>
+<h4 class="menu"><a class="{{ if eq $currentID .UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></h4>
 <ul class="menu">
-{{ range $taxonomy.Pages -}}
-<li><a class="{{ if eq $currentID .UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li>
+{{ range .Pages -}}
+<li><a class="{{ if eq $currentID .UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></li>
 {{ end -}}
 </ul>
 </section>
 {{ end -}}
-{{ end -}}
 </aside>
diff --git a/theme.toml b/theme.toml
index 00ec4ec..0179b8c 100644
--- a/theme.toml
+++ b/theme.toml
@@ -3,9 +3,9 @@ description = "A port of the Drupal zen base theme with libsass and gulp support
 homepage = "https://github.com/frjo/hugo-theme-zen"
 license = "GPLv2"
 licenselink = "http://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
-tags = ["simple", "articles"]
-features = ["responsive", "grid", "sass", "gulp", "search"]
-min_version = 0.18
+tags = ["simple", "articles", "blog"]
+features = ["responsive", "grid", "sass", "gulp", "search", "piwik", "jsonfeed"]
+min_version = 0.23
 
 [author]
   name = "Fredrik Jonsson"