diff --git a/layouts/index.html b/layouts/index.html
index f2e33ee5..8e02c171 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -8,7 +8,7 @@
 {{ range $index, $page := where .Data.Pages "Type" "home" }}
   {{ $params := dict "root" $ "page" $page }}
   {{ $widget := printf "widgets/%s.html" ( or $page.Params.widget "custom" ) }}
-  <section id="{{ $page.File.BaseFileName }}" class="home-section">
+  <section id="{{ $page.File.TranslationBaseName }}" class="home-section">
     <div class="container">
       {{ partial $widget $params }}
     </div>
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index cd87db70..62e2f558 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -10,7 +10,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="{{ "/" | relURL }}">{{ .Site.Title }}</a>
+      <a class="navbar-brand" href="{{ "/" | relLangURL }}">{{ .Site.Title }}</a>
     </div>
 
     <!-- Collect the nav links, forms, and other content for toggling -->
@@ -29,7 +29,7 @@
           <ul class="dropdown-menu">
             {{ range .Children }}
             <li class="nav-item">
-              <a href="{{ .URL | relURL }}"{{ if $.IsHome }} data-target="{{ .URL }}"{{ end }}>
+              <a href="{{ .URL | relLangURL }}"{{ if $.IsHome }} data-target="{{ .URL }}"{{ end }}>
                 {{ .Pre }}
                 <span>{{ .Name }}</span>
               </a>
@@ -41,7 +41,7 @@
         {{ else }}
 
         <li class="nav-item">
-          <a href="{{ .URL | relURL }}"{{ if $.IsHome }} data-target="{{ .URL }}"{{ end }}>
+          <a href="{{ .URL | relLangURL }}"{{ if $.IsHome }} data-target="{{ .URL }}"{{ end }}>
             {{ .Pre }}
             <span>{{ .Name }}</span>
           </a>
diff --git a/layouts/partials/widgets/posts.html b/layouts/partials/widgets/posts.html
index 8eba961a..181d8e3a 100644
--- a/layouts/partials/widgets/posts.html
+++ b/layouts/partials/widgets/posts.html
@@ -10,7 +10,7 @@
     {{ with $page.Params.subtitle }}<p>{{ . | markdownify }}</p>{{ end }}
     {{ if gt $posts_len $page.Params.count }}
     <p class="view-all">
-      <a href="{{ "/post/" | relURL }}">
+      <a href="{{ "/post/" | relLangURL }}">
         {{ i18n "more_posts" | markdownify }}
         <i class="fa fa-angle-double-right"></i>
       </a>
diff --git a/layouts/partials/widgets/publications.html b/layouts/partials/widgets/publications.html
index f967f109..f790eca4 100644
--- a/layouts/partials/widgets/publications.html
+++ b/layouts/partials/widgets/publications.html
@@ -9,7 +9,7 @@
     {{ with $page.Params.subtitle }}<p>{{ . | markdownify }}</p>{{ end }}
     {{ if gt $pubs_len $page.Params.count }}
     <p class="view-all">
-      <a href="{{ $.Site.BaseURL }}publication/">
+      <a href="{{ "/publication/" | relLangURL }}">
         {{ i18n "more_publications" | markdownify }}
         <i class="fa fa-angle-double-right"></i>
       </a>
diff --git a/layouts/partials/widgets/talks.html b/layouts/partials/widgets/talks.html
index c2da2b6d..e7914093 100644
--- a/layouts/partials/widgets/talks.html
+++ b/layouts/partials/widgets/talks.html
@@ -9,7 +9,7 @@
     {{ with $page.Params.subtitle }}<p>{{ . | markdownify }}</p>{{ end }}
     {{ if gt $talks_len $page.Params.count }}
     <p class="view-all">
-      <a href="{{ $.Site.BaseURL }}talk/">
+      <a href="{{ "/talk/" | relLangURL }}">
         {{ i18n "more_talks" | markdownify }}
         <i class="fa fa-angle-double-right"></i>
       </a>