diff --git a/exampleSite/content.en/posts/_index.md b/exampleSite/content.en/posts/_index.md
index 001ae24..996c430 100644
--- a/exampleSite/content.en/posts/_index.md
+++ b/exampleSite/content.en/posts/_index.md
@@ -1,7 +1,6 @@
 ---
 menu:
   after:
-    name: blog
     weight: 5
 title: Blog
 ---
diff --git a/exampleSite/content.en/showcases.md b/exampleSite/content.en/showcases.md
new file mode 100644
index 0000000..521d2ff
--- /dev/null
+++ b/exampleSite/content.en/showcases.md
@@ -0,0 +1,10 @@
+---
+title: Showcases
+layout: landing
+---
+
+<div class="book-hero text-center">
+
+# At the moment this page is empty
+
+<div>
\ No newline at end of file
diff --git a/exampleSite/hugo.toml b/exampleSite/hugo.toml
index 6b1550a..dea2c74 100644
--- a/exampleSite/hugo.toml
+++ b/exampleSite/hugo.toml
@@ -42,24 +42,23 @@ enableGitInfo = true
 [menu]
 [[menu.home]]
   name = "Documentation"
-  url = "/docs/example/"
+  pageRef = "/docs/example/"
   weight = 1
 
 [[menu.home]]
-  name = "Introduction"
-  url = "/docs/example/"
+  pageRef = "/docs/example/"
   weight = 10
   parent = "Documentation"
 
 [[menu.home]]
   name = "Shortcodes"
-  url = "/docs/shortcodes/badges/"
+  pageRef = "/docs/shortcodes/badges/"
   weight = 20
   parent = "Documentation"
 
 [[menu.home]]
   name = "Showcases"
-  url = "/showcases/"
+  pageRef = "/showcases/"
   weight = 2
 
 [[menu.home]]
diff --git a/exampleSite/hugo.yaml b/exampleSite/hugo.yaml
index 535bd92..0f03366 100644
--- a/exampleSite/hugo.yaml
+++ b/exampleSite/hugo.yaml
@@ -40,18 +40,17 @@ languages:
 menu:
   home:
     - name: "Documentation"
-      url: "/docs/example/"
+      pageRef: "/docs/example/"
       weight: 1
-    - name: "Introduction"
-      url: "/docs/example/"
+    - pageRef: "/docs/example/"
       weight: 10
       parent: "Documentation"
     - name: "Shortcodes"
-      url: "/docs/shortcodes/badges/"
+      pageRef: "/docs/shortcodes/badges/"
       weight: 20
       parent: "Documentation"
     - name: "Showcases"
-      url: "/showcases/"
+      pageRef: "/showcases/"
       weight: 2
     - name: "Github"
       url: "https://github.com/alex-shpak/hugo-book/"
diff --git a/layouts/_partials/docs/menu-hugo.html b/layouts/_partials/docs/menu-hugo.html
index 871eea7..76c5fd8 100644
--- a/layouts/_partials/docs/menu-hugo.html
+++ b/layouts/_partials/docs/menu-hugo.html
@@ -1,29 +1,43 @@
 <!--
-  This is template for hugo menus, accepts MenuEntity as context
+  This is template for hugo menus, accepts Page and Menu as context
   https://gohugo.io/variables/menus/
 -->
-{{ if . }}
-  {{ template "book-menu-hugo" . }}
-{{ end }}
+{{- if .Menu -}}
+  {{- template "book-menu-hugo" . -}}
+{{- end -}}
 
 {{ define "book-menu-hugo" }}
 <ul>
-  {{ range . }}
+{{- range .Menu -}}
+  {{- $class := slice -}}
+  {{- with .Params.class -}}
+    {{- $class = $class | append . -}}
+  {{- end -}}
+  {{- if $.Page.IsMenuCurrent .Menu . -}}
+    {{- $class = $class | append "active" -}}
+  {{- end -}}
   <li>
-    {{ $isRemote := not (or (.Page) (strings.HasPrefix .URL "/")) }}
-    <a href="{{ .URL }}" {{ with .Params.class }}class="{{ . }}"{{ end }} {{ if $isRemote }}target="_blank" rel="noopener"{{ end }}>
+    {{- $isRemote := not (or (.Page) (strings.HasPrefix .URL "/")) -}}
+    <a href="{{ .URL }}"
+      {{- with $class }}class="{{ delimit . " " }}"{{ end -}}
+      {{- with .Title }}title="{{ . }}"{{ end -}}
+      {{- if $isRemote }}target="_blank" rel="noopener"{{ end -}}>
       {{- .Pre -}}
-      {{ with .Page }}
-        {{ partial "docs/title" .Page }}
-      {{ else }}
-        {{ .Name }}
-      {{ end }}
+      {{ template "book-menu-title" . }}
       {{- .Post -}}
     </a>
     {{- with .Children }}
-      {{ template "book-menu-hugo" . }}
+      {{ template "book-menu-hugo" (dict "Page" $.Page "Menu" .) }}
     {{- end }}
   </li>
-  {{ end }}
+{{- end -}}
 </ul>
 {{ end }}
+
+{{ define "book-menu-title" }}
+{{ if .Name }}
+  {{ .Name }}
+{{ else if .Page }}
+  {{ partial "docs/title" .Page }}
+{{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/_partials/docs/menu.html b/layouts/_partials/docs/menu.html
index dbb2e49..9128b4f 100644
--- a/layouts/_partials/docs/menu.html
+++ b/layouts/_partials/docs/menu.html
@@ -6,11 +6,11 @@
 {{ end }}
 
 {{ partial "docs/inject/menu-before" . }}
-{{ partial "docs/menu-hugo" .Site.Menus.before }}
+{{ partial "docs/menu-hugo" (dict "Page" .Page "Menu" .Site.Menus.before) }}
 
 {{ partial "docs/menu-filetree" . }}
 
-{{ partial "docs/menu-hugo" .Site.Menus.after }}
+{{ partial "docs/menu-hugo" (dict "Page" .Page "Menu" .Site.Menus.after) }}
 {{ partial "docs/inject/menu-after" . }}
 </nav>
 
diff --git a/layouts/landing.html b/layouts/landing.html
index 76b8637..2518b60 100644
--- a/layouts/landing.html
+++ b/layouts/landing.html
@@ -10,6 +10,6 @@
 
 {{ define "header" }}
 <nav>
-  {{ partial "docs/menu-hugo" .Site.Menus.home }}
+  {{ partial "docs/menu-hugo" (dict "Page" .Page "Menu" .Site.Menus.home) }}
 </nav>
 {{ end }}