diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index 08760a0..c070bfe 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -2,7 +2,7 @@
     <div class="container">
         <div class="section tags-list">
             {{- range $key, $value:= .Data.Terms -}}
-            <a class="tag-cloud" href="{{ "/" | absLangURL }}{{ $.Data.Plural | urlize }}/{{ $key | urlize }}">{{  $key }}&nbsp;({{ $value.Count }})</a>
+            <a class="tag-cloud" href="{{ "/" | absLangURL }}{{ $.Data.Plural | urlize }}/{{ $key | urlize }}">{{ $key }}&nbsp;({{ $value.Count }})</a>
             {{- end -}}
         </div>
     </div>
diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
index ba0f13e..66c312d 100644
--- a/layouts/partials/nav.html
+++ b/layouts/partials/nav.html
@@ -92,13 +92,13 @@
             {{ end }}
             {{ end }}
 
-            {{ if gt (len  $.Site.Home.AllTranslations.ByWeight) 1 }}
             {{ range $.Site.Home.AllTranslations.ByWeight }}
-                <a class="navbar-item" href="{{ .Permalink }}">{{ .Language.LanguageName }}</a>
+            {{ if ne .Language.LanguageName $.Language.LanguageName }}
+            <a class="navbar-item" href="{{ .Permalink }}">{{ .Language.LanguageName }}</a>
             {{ end }}
             {{ end }}
 
-            {{ if and .Site.Params.showRSSButton .Site.RSSLink  }}
+            {{ if and .Site.Params.showRSSButton .Site.RSSLink }}
             <a class="navbar-item" href="{{ .Site.RSSLink }}"><i class="fas fa-rss"></i></a>
             {{ end }}
             {{ end }}