diff --git a/layouts/index.html b/layouts/_default/index.html
similarity index 94%
rename from layouts/index.html
rename to layouts/_default/index.html
index d39c7aa..be84f77 100644
--- a/layouts/index.html
+++ b/layouts/_default/index.html
@@ -1,9 +1,9 @@
 {{ define "main" }}
-{{ $headless := .Site.GetPage "/homepage" }}
+{{ $headless := .GetPage "./homepage" }}
 {{ $sections := $headless.Resources.ByType "page" }}
 {{ $sections := cond .Site.BuildDrafts $sections (where $sections "Draft" "==" false) }}
 {{ $content := where (where $sections "Params.external" "==" nil) "Params.detailed_page_homepage_content" "ne" false }}
-{{ $languages := .Site.Languages }}
+{{ $translations := .Page.AllTranslations }}
 
 <!-- Welcome screen that scrolls out of view -->
 {{ if not .Params.header_use_video }}
@@ -35,17 +35,17 @@
             {{- partial "custom_header_video.html" . -}}
         {{ end }}
 
-	{{ $num_lang := len $languages }}
+	{{ $num_lang := len $translations }}
 	{{ if and (gt $num_lang 1) $.Site.Params.language_menu }}
 	<div id="site-languages" class="inner">
-    {{ range site.Sites }}
-      {{ $lang_title := or .Language.LanguageName (.Language.Lang | strings.ToUpper) }}
-      {{ if eq . $.Site }}
+    {{ range $translations }}
+      {{ $lang_title := or .Language.LanguageName (.Lang | strings.ToUpper) }}
+      {{ if eq .Lang $.Lang }}
         {{ if $.Site.Params.show_current_lang }}
           <span class='btn-lang active'>{{ $lang_title }}</span>
         {{ end }}
       {{ else }}
-        <a class='btn-lang' href='{{ .Home.Permalink }}'>{{ $lang_title }}</a>
+        <a class='btn-lang' href='{{ .RelPermalink }}'>{{ $lang_title }}</a>
       {{ end }}
     {{ end }}
 	</div>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 076af2f..33101ba 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -2,7 +2,9 @@
   <main class="content page-template page-{{ .Slug }}">
     <article class="post page">
       <header class="post-header">
-        <a id="back-to-main-page" href="{{ "" | relLangURL }}"><i class="fa fa-chevron-left" aria-hidden="true"></i> {{ .Site.Title }}</a>
+        {{ with .Parent }}
+        <a id="back-to-main-page" href="{{ .RelPermalink | relLangURL }}"><i class="fa fa-chevron-left" aria-hidden="true"></i> {{ or .Title .Site.Title }}</a>
+        {{ end }}
       </header>
       <h1 class="post-title">{{ .Title }}</h1>
       <section class="post-content">