diff --git a/layouts/index.html b/layouts/index.html
index bb4eaef..567921d 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -29,10 +29,9 @@
       <div class="row">
         <div class="col-12">
           <div class="section bg-white shadow text-center">
-            {{ with .Site.Params.cta.title }} <h2 class="mb-4">{{ . }}</h2> {{ end }}
-            {{ with .Site.Params.cta.description }} <p class="mb-4">{{ . }}</p> {{ end }}
-            <a href="{{ with .Site.Params.cta.btnURL}}{{ . | absURL }}{{ end }}"
-              class="btn btn-primary">{{ with .Site.Params.cta.btnText}}{{ . }}{{ end }}</a>
+          {{ with .Site.Params.cta.title }} <h2 class="mb-4">{{ . }}</h2> {{ end }}
+          {{ with .Site.Params.cta.description }} <p class="mb-4">{{ . }}</p> {{ end }}
+          <a href="{{ with .Site.Params.cta.btnURL}}{{ . | relLangURL }}{{ end }}" class="btn btn-primary">{{ with .Site.Params.cta.btnText}}{{ . }}{{ end }}</a>
           </div>
         </div>
       </div>
diff --git a/layouts/partials/navigation.html b/layouts/partials/navigation.html
index 2571cb9..449c845 100644
--- a/layouts/partials/navigation.html
+++ b/layouts/partials/navigation.html
@@ -1,5 +1,5 @@
 <nav class="navbar navbar-expand-lg navbar-light">
-  <a class="navbar-brand" href="{{ .Site.BaseURL }}{{ .Language.LanguageName | lower }}">
+  <a class="navbar-brand" href="{{ .Site.BaseURL | relLangURL }}{{ .Language.LanguageName | lower }}">
     {{ $logo:= .Site.Params.logo }}
     {{ $logoWhite:= .Site.Params.logoWhite }}
     {{ if (or (eq $logo "") (eq $logoWhite "")) }}
@@ -20,7 +20,7 @@
   <div class="collapse navbar-collapse text-center" id="navigation">
     <ul class="navbar-nav ml-auto">
       <li class="nav-item">
-        <a class="nav-link text-dark" href="{{ .Site.BaseURL }}{{ .Language.LanguageName | lower }}">{{ .Site.Params.home }}</a>
+        <a class="nav-link text-dark" href="{{ .Site.BaseURL | relLangURL }}">{{ .Site.Params.home }}</a>
       </li>
       {{ range .Site.Menus.main }}
       {{ if .HasChildren }}
@@ -31,13 +31,13 @@
         </a>
         <div class="dropdown-menu" >
           {{ range .Children }}
-          <a class="dropdown-item" href="{{ .URL | absURL }}">{{ .Name }}</a>
+          <a class="dropdown-item" href="{{ .URL | relLangURL }}">{{ .Name }}</a>
           {{ end }}
         </div>
       </li>
       {{ else }}
       <li class="nav-item">
-        <a class="nav-link text-dark" href="{{ .URL | absURL }}">{{ .Name }}</a>
+          <a class="nav-link text-dark" href="{{ .URL | relLangURL }}">{{ .Name }}</a>
       </li>
       {{ end }}
       {{ end }}