diff --git a/layouts/index.html b/layouts/index.html
index d2de694..4d0a585 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -29,9 +29,9 @@
     {{- partial "sections/home.html" . -}}
 
     <!--- ADD OPTIONAL SECTIONS ----------->
-    {{ if .Site.Data.sections }}
+    {{ if (index .Site.Data .Site.Language.Lang).sections }}
       {{ $background:= "bg-white"}}
-      {{ range sort .Site.Data.sections "section.weight" }}
+      {{ range sort (index .Site.Data .Site.Language.Lang).sections "section.weight" }}
         {{ if .section.enable }}
           <div class="container-fluid section-holder d-flex {{ $background }}">
             {{ if .section.template }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index efa3f97..048fa79 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -3,9 +3,9 @@
     <div class="row text-left">
       <div class="col-md-4 col-sm-12">
         <h5>Navigation</h5>
-        {{ if .Site.Data.sections }}
+        {{ if (index .Site.Data .Site.Language.Lang).sections }}
         <ul>
-          {{- range sort .Site.Data.sections "section.weight" }}
+          {{- range sort (index .Site.Data .Site.Language.Lang).sections "section.weight" }}
             {{ if and (.section.enable) (.section.showOnNavbar)}}
             <li class="nav-item">
               <a class="smooth-scroll" href="/#{{ replace (lower .section.name) " " "-" }}">{{ .section.name }}</a>
diff --git a/layouts/partials/navigators/navbar.html b/layouts/partials/navigators/navbar.html
index 24e2b1a..d936292 100644
--- a/layouts/partials/navigators/navbar.html
+++ b/layouts/partials/navigators/navbar.html
@@ -25,10 +25,10 @@
     <div class="collapse navbar-collapse" id="top-nav-items">
       <ul class="navbar-nav ml-auto">
         <li class="nav-item">
-          <a class="nav-link" href="#home">Home</a>
+          <a class="nav-link" href="#home">{{ i18n "home" }}</a>
         </li>
-        {{- if .Site.Data.sections }}
-          {{- range sort .Site.Data.sections "section.weight" }}
+        {{ if (index .Site.Data .Site.Language.Lang).sections }}
+          {{ range sort (index .Site.Data .Site.Language.Lang).sections "section.weight" }}
             {{ if and (.section.enable) (.section.showOnNavbar)}}
               <li class="nav-item">
                 <a class="nav-link" href="#{{ replace (lower .section.name) " " "-" }}">{{ .section.name }}</a>
@@ -55,6 +55,25 @@
             <a class="nav-link" href="{{ .url }}">{{ .name }}</a>
           </li>
         {{ end }}
+        <li class="nav-item">
+            {{ if .IsTranslated }}
+            <ul>
+              <div class="dropdown">
+                <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  {{ .Site.Language.LanguageName }}
+                </button>
+                <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                  {{ range $.Site.Home.AllTranslations }}
+                    <a class="dropdown-item" href="{{ .Permalink }}">
+                      <img class="flag" src="https://www.countryflags.io/{{ cond (eq .Site.Language.Lang "en") "gb" .Language }}/flat/32.png">
+                      {{ .Language.LanguageName }}
+                    </a>
+                  {{ end }}
+                </div>
+              </div>
+            </ul>
+            {{ end }}
+        </li>
       </ul>
     </div>
   </div>
diff --git a/layouts/partials/sections/about.html b/layouts/partials/sections/about.html
index e2888b4..2e6414c 100644
--- a/layouts/partials/sections/about.html
+++ b/layouts/partials/sections/about.html
@@ -29,7 +29,7 @@
       </div>
       {{ if .resume }}
       <a href="{{ .resume }}" target="#"
-        ><button class="btn btn-dark">My Resume</button></a
+        ><button class="btn btn-dark">{{ i18n "resume"}}</button></a
       >
       {{ end }}
     </div>
diff --git a/layouts/partials/sections/home.html b/layouts/partials/sections/home.html
index 549079d..9d00fc6 100644
--- a/layouts/partials/sections/home.html
+++ b/layouts/partials/sections/home.html
@@ -23,12 +23,18 @@
       <span class="ityped-cursor"></span>
     </div>
     <ul id="typing-carousel-data">
-      {{ range .Site.Params.author.summary }}
-      <li>{{ . }}</li>
+      {{ if .Site.Params.author.summary }}
+        {{ range .Site.Params.author.summary }}
+          <li>{{ . }}</li>
+        {{ end}}
+      {{ else }}
+        {{ range (split (i18n "quotes") ";") }}
+          <li>{{ . }}</li>
+        {{ end}}
       {{ end }}
     </ul>
-    {{ if .Site.Data.sections }}
-      {{ range first 1 (where (sort .Site.Data.sections "section.weight") ".section.enable" true) }}
+    {{ if (index .Site.Data .Site.Language.Lang).sections }}
+      {{ range first 1 (where (sort (index .Site.Data .Site.Language.Lang).sections "section.weight") ".section.enable" true) }}
         <a href="#{{ replace (lower .section.name) " " "-" }}"><i class="arrow bounce fa fa-chevron-down"></i></a>
       {{ end }}
     {{ end }}