diff --git a/documentation/themes/beastie/layouts/index.html b/documentation/themes/beastie/layouts/index.html
index e7c72d5ee3..1ba57c710a 100644
--- a/documentation/themes/beastie/layouts/index.html
+++ b/documentation/themes/beastie/layouts/index.html
@@ -19,15 +19,13 @@
           </ul>
         </li>
       </ul>
-      <h1 class="books-title">{{ i18n "books" }} - {{ $home.Language }}</h1>
+      <h1 class="books-title">{{ i18n "books" }} - {{ $home.Language.LanguageName }}</h1>
       {{ $books := slice}}
 
       {{ range where .Site.Pages "Section" "books" }}
-        {{ with .File }}
-          {{ $subDirsNumer := .File.Path | strings.Count "/" }}
-          {{ if eq $subDirsNumer 2 }}
-            {{ $books  = $books  | append (dict "page" . "path" .File.Path) }}
-          {{ end }}
+        {{ $subDirsNumer := .File.Path | strings.Count "/" }}
+        {{ if eq $subDirsNumer 2 }}
+          {{ $books  = $books  | append (dict "page" . "path" .File.Path) }}
         {{ end }}
       {{ end }}
 
@@ -36,20 +34,18 @@
         {{ if in .path "_index.adoc" }}
           {{ $bookPath := replaceRE "/_index.adoc" "" .path }}
           {{ $bookName := replaceRE "books/" "" $bookPath }}
-          <li><a href="{{ $bookPath }}">{{ $bookName }}</a></li>
+          <li><a href="{{ $bookPath }}">{{ .page.Title }}</a></li>
         {{ end }}
       {{ end }}
       </ul>
 
-      <h1 class="articles-title">{{ i18n "articles" }} - {{ $home.Language }}</h1>
+      <h1 class="articles-title">{{ i18n "articles" }} - {{ $home.Language.LanguageName }}</h1>
       {{ $articles := slice}}
 
       {{ range where .Site.Pages "Section" "articles" }}
-        {{ with .File }}
-          {{ $subDirsNumer := .File.Path | strings.Count "/" }}
-          {{ if eq $subDirsNumer 2 }}
-            {{ $articles  = $articles  | append (dict "page" . "path" .File.Path) }}
-          {{ end }}
+        {{ $subDirsNumer := .File.Path | strings.Count "/" }}
+        {{ if eq $subDirsNumer 2 }}
+          {{ $articles  = $articles  | append (dict "page" . "path" .File.Path) }}
         {{ end }}
       {{ end }}
 
@@ -58,7 +54,7 @@
         {{ if in .path "_index.adoc" }}
           {{ $articlePath := replaceRE "/_index.adoc" "" .path }}
           {{ $articleName := replaceRE "articles/" "" $articlePath }}
-          <li><a href="{{ $articlePath }}">{{ $articleName }}</a></li>
+          <li><a href="{{ $articlePath }}">{{ .page.Title }}</a></li>
         {{ end }}
       {{ end }}
       </ul>