diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
index aebc1e7af..c921ca319 100644
--- a/layouts/partials/nav.html
+++ b/layouts/partials/nav.html
@@ -48,7 +48,7 @@ <h4>{{ .Site.Params.logo_text }}</h4>
                     <!-- Check if the first child marks a menu section identifier -->
                     {{ $hasSections := (hasPrefix (index .Children 0).Identifier "section.") }}
                     <li class="dropdown{{ if $hasSections }} use-yamm yamm-fw{{end}} {{ $active }}">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ .Name }} <span class="caret"></span></a>
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ i18n .Identifier | default .Name}} <span class="caret"></span></a>
                         {{ if $hasSections }}
                         <ul class="dropdown-menu">
                             <li>
@@ -56,18 +56,18 @@ <h4>{{ .Site.Params.logo_text }}</h4>
                             <div class="row">
                                 {{ if ne .URL "" }}
                                 <div class="col-sm-6">
-                                    <img src="{{ .URL }}" class="img-responsive hidden-xs"/>
+                                    <img src="{{ .URL | absLangURL }}" class="img-responsive hidden-xs"/>
                                 </div>
                                 {{ end }}
                                 <div class="col-sm-3">
                                 {{ range .Children.ByWeight }}
                                     {{ $column := printf "%s" .Post }}
                                     {{ if eq $column "1" }}
-                                    <h5>{{ .Name }}</h5>
+                                    <h5>{{ i18n .Identifier | default .Name}}</h5>
                                     {{ if .HasChildren }}
                                     <ul>
                                     {{ range .Children.ByWeight }}
-                                    <li><a href="{{ .URL }}">{{ .Name }}</a></li>
+                                    <li><a href="{{ .URL | absLangURL }}">{{ i18n .Identifier | default .Name}}</a></li>
                                     {{- end }}
                                     </ul>
                                     {{ end }}
@@ -78,11 +78,11 @@ <h5>{{ .Name }}</h5>
                                 {{ range .Children.ByWeight }}
                                     {{ $column := printf "%s" .Post }}
                                     {{ if eq $column "2" }}
-                                    <h5>{{ .Name }}</code></h5>
+                                    <h5>{{ i18n .Identifier | default .Name}}</code></h5>
                                     {{ if .HasChildren }}
                                     <ul>
                                     {{ range .Children.ByWeight }}
-                                    <li><a href="{{ .URL }}">{{ .Name }}</a></li>
+                                    <li><a href="{{ .URL | absLangURL }}">{{ i18n .Identifier | default .Name}}</a></li>
                                     {{ end }}
                                     </ul>
                                     {{ end }}
@@ -94,11 +94,11 @@ <h5>{{ .Name }}</code></h5>
                                 {{ range .Children }}
                                     {{ $column := printf "%s" .Post }}
                                     {{ if eq $column "3" }}
-                                    <h5>{{ .Name }}</code></h5>
+                                    <h5>{{ i18n .Identifier | default .Name}}</code></h5>
                                     {{ if .HasChildren }}
                                     <ul>
                                     {{ range .Children.ByWeight }}
-                                    <li><a href="{{ .URL }}">{{ .Name }}</a></li>
+                                    <li><a href="{{ .URL | absLangURL }}">{{ i18n .Identifier | default .Name}}</a></li>
                                     {{ end }}
                                     </ul>
                                     {{ end }}
@@ -109,11 +109,11 @@ <h5>{{ .Name }}</code></h5>
                                 {{ range .Children }}
                                     {{ $column := printf "%s" .Post }}
                                     {{ if eq $column "4" }}
-                                    <h5>{{ .Name }}</code></h5>
+                                    <h5>{{ i18n .Identifier | default .Name}}</code></h5>
                                     {{ if .HasChildren }}
                                     <ul>
                                     {{ range .Children.ByWeight }}
-                                    <li><a href="{{ .URL }}">{{ .Name }}</a></li>
+                                    <li><a href="{{ .URL | absLangURL }}">{{ i18n .Identifier | default .Name}}</a></li>
                                     {{ end }}
                                     </ul>
                                     {{ end }}
@@ -128,14 +128,14 @@ <h5>{{ .Name }}</code></h5>
                         {{ else }}
                         <ul class="dropdown-menu">
                             {{ range .Children.ByWeight }}
-                            <li><a href="{{ .URL }}">{{ .Name }}</a></li>
+                            <li><a href="{{ .URL | absLangURL }}">{{ i18n .Identifier | default .Name}}</a></li>
                             {{ end }}
                         </ul>
                         {{ end }}
                     </li>
                   {{ else }}
                   <li class="dropdown {{ $active }}">
-                    <a href="{{ .URL }}">{{ .Name }}</a>
+                    <a href="{{ .URL | absLangURL }}">{{ i18n .Identifier | default .Name}}</a>
                   </li>
                   {{ end }}
                   {{ end }}
diff --git a/package-lock.json b/package-lock.json
index afde54499..d696eaebc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2184,13 +2184,10 @@
       "dev": true
     },
     "node_modules/json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -2463,9 +2460,9 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -5611,13 +5608,10 @@
       "dev": true
     },
     "json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true
     },
     "kind-of": {
       "version": "6.0.3",
@@ -5811,9 +5805,9 @@
       "dev": true
     },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"