diff --git a/hugo.toml b/hugo.toml
index d158418..a881963 100644
--- a/hugo.toml
+++ b/hugo.toml
@@ -87,6 +87,7 @@ pagination.pagerSize = 5
     # set title for the table of contents
     # can be overridden in a page's front-matter
     TocTitle = "Table of Contents" # default
+    _menu = "Menu"
     _minute = "minute"
     _minutes = "minutes"
     _readingTime = "to read"
@@ -135,6 +136,7 @@ pagination.pagerSize = 5
     # set title for the table of contents
     # can be overridden in a page's front-matter
     TocTitle = "Inhaltsverzeichnis" # default
+    _menu = "Menü"
     _minute = "Minute"
     _minutes = "Minuten"
     _readingTime = "Lesezeit"
diff --git a/layouts/partials/mobile-menu.html b/layouts/partials/mobile-menu.html
new file mode 100644
index 0000000..6633785
--- /dev/null
+++ b/layouts/partials/mobile-menu.html
@@ -0,0 +1,29 @@
+<ul class="menu menu--mobile">
+  <li class="menu__trigger">{{ $.Site.Params._menu }}&nbsp;▾</li>
+  <li>
+    <ul class="menu__dropdown">
+      {{ range $.Site.Menus.main }}
+        {{ if not .HasChildren }}
+          <li><a href="{{ .URL }}">{{ .Name }}</a></li>
+        {{ else }}
+        <li class="menu__subdrop--title">▾&nbsp;{{ .Name }}</li>
+        <li>
+          <ul  class="menu__subdrop--list">
+            {{ range .Children  }}
+            <li><a href="{{ .URL }}" {{ if .Params.NewTab -}} target="_blank" {{- end }}>{{ .Name }}</a></li>
+            {{ end }}  
+          </ul>
+        </li>
+        {{ end }}
+      {{ end }}
+      {{ if and $.Site.Params.showLanguageSelector (len $.Site.Home.AllTranslations) }}
+        <hr />
+        {{ range $.Site.Home.AllTranslations }}
+          <li>
+            <a href='{{ .RelPermalink }}{{ strings.TrimPrefix (print "/" $.Language.LanguageCode "/") $.Page.RelPermalink }}'>{{ .Language.LanguageName }}</a>
+          </li>
+        {{ end }}
+      {{ end }}
+    </ul>
+  </li>
+</ul>
diff --git a/public/de/404.html b/public/de/404.html
index 3fe11fa..86c8425 100644
--- a/public/de/404.html
+++ b/public/de/404.html
@@ -107,7 +107,7 @@
     </div>
     
       <ul class="menu menu--mobile">
-  <li class="menu__trigger">Menu&nbsp;▾</li>
+  <li class="menu__trigger">Menü&nbsp;▾</li>
   <li>
     <ul class="menu__dropdown">
       
@@ -123,11 +123,11 @@
         <hr />
         
           <li>
-            <a href="/en/">English</a>
+            <a href='/en/404.html'>English</a>
           </li>
         
           <li>
-            <a href="/de/">Deutsch</a>
+            <a href='/de/404.html'>Deutsch</a>
           </li>
         
       
diff --git a/public/de/about/index.html b/public/de/about/index.html
index 6b97c00..866ab72 100644
--- a/public/de/about/index.html
+++ b/public/de/about/index.html
@@ -115,7 +115,7 @@ Below you can read the original about from Radek
     </div>
     
       <ul class="menu menu--mobile">
-  <li class="menu__trigger">Menu&nbsp;▾</li>
+  <li class="menu__trigger">Menü&nbsp;▾</li>
   <li>
     <ul class="menu__dropdown">
       
@@ -131,11 +131,11 @@ Below you can read the original about from Radek
         <hr />
         
           <li>
-            <a href="/en/">English</a>
+            <a href='/en/about/'>English</a>
           </li>
         
           <li>
-            <a href="/de/">Deutsch</a>
+            <a href='/de/about/'>Deutsch</a>
           </li>
         
       
diff --git a/public/de/categories/index.html b/public/de/categories/index.html
index de2771f..425f02b 100644
--- a/public/de/categories/index.html
+++ b/public/de/categories/index.html
@@ -109,7 +109,7 @@
     </div>
     
       <ul class="menu menu--mobile">
-  <li class="menu__trigger">Menu&nbsp;▾</li>
+  <li class="menu__trigger">Menü&nbsp;▾</li>
   <li>
     <ul class="menu__dropdown">
       
@@ -125,11 +125,11 @@
         <hr />
         
           <li>
-            <a href="/en/">English</a>
+            <a href='/en/categories/'>English</a>
           </li>
         
           <li>
-            <a href="/de/">Deutsch</a>
+            <a href='/de/categories/'>Deutsch</a>
           </li>
         
       
diff --git a/public/de/index.html b/public/de/index.html
index 50627ef..1d9efcf 100644
--- a/public/de/index.html
+++ b/public/de/index.html
@@ -110,7 +110,7 @@
     </div>
     
       <ul class="menu menu--mobile">
-  <li class="menu__trigger">Menu&nbsp;▾</li>
+  <li class="menu__trigger">Menü&nbsp;▾</li>
   <li>
     <ul class="menu__dropdown">
       
@@ -126,11 +126,11 @@
         <hr />
         
           <li>
-            <a href="/en/">English</a>
+            <a href='/en/'>English</a>
           </li>
         
           <li>
-            <a href="/de/">Deutsch</a>
+            <a href='/de/'>Deutsch</a>
           </li>
         
       
diff --git a/public/de/posts/index.html b/public/de/posts/index.html
index c9add54..a05dde6 100644
--- a/public/de/posts/index.html
+++ b/public/de/posts/index.html
@@ -109,7 +109,7 @@
     </div>
     
       <ul class="menu menu--mobile">
-  <li class="menu__trigger">Menu&nbsp;▾</li>
+  <li class="menu__trigger">Menü&nbsp;▾</li>
   <li>
     <ul class="menu__dropdown">
       
@@ -125,11 +125,11 @@
         <hr />
         
           <li>
-            <a href="/en/">English</a>
+            <a href='/en/posts/'>English</a>
           </li>
         
           <li>
-            <a href="/de/">Deutsch</a>
+            <a href='/de/posts/'>Deutsch</a>
           </li>
         
       
diff --git a/public/de/posts/one-word/index.html b/public/de/posts/one-word/index.html
index d191625..f6db36f 100644
--- a/public/de/posts/one-word/index.html
+++ b/public/de/posts/one-word/index.html
@@ -109,7 +109,7 @@
     </div>
     
       <ul class="menu menu--mobile">
-  <li class="menu__trigger">Menu&nbsp;▾</li>
+  <li class="menu__trigger">Menü&nbsp;▾</li>
   <li>
     <ul class="menu__dropdown">
       
@@ -125,11 +125,11 @@
         <hr />
         
           <li>
-            <a href="/en/">English</a>
+            <a href='/en/posts/one-word/'>English</a>
           </li>
         
           <li>
-            <a href="/de/">Deutsch</a>
+            <a href='/de/posts/one-word/'>Deutsch</a>
           </li>
         
       
diff --git a/public/de/posts/test-post/index.html b/public/de/posts/test-post/index.html
index 3a0138b..8f12e18 100644
--- a/public/de/posts/test-post/index.html
+++ b/public/de/posts/test-post/index.html
@@ -111,7 +111,7 @@
     </div>
     
       <ul class="menu menu--mobile">
-  <li class="menu__trigger">Menu&nbsp;▾</li>
+  <li class="menu__trigger">Menü&nbsp;▾</li>
   <li>
     <ul class="menu__dropdown">
       
@@ -127,11 +127,11 @@
         <hr />
         
           <li>
-            <a href="/en/">English</a>
+            <a href='/en/posts/test-post/'>English</a>
           </li>
         
           <li>
-            <a href="/de/">Deutsch</a>
+            <a href='/de/posts/test-post/'>Deutsch</a>
           </li>
         
       
diff --git a/public/de/tags/index.html b/public/de/tags/index.html
index 1ebf7c5..5a74509 100644
--- a/public/de/tags/index.html
+++ b/public/de/tags/index.html
@@ -109,7 +109,7 @@
     </div>
     
       <ul class="menu menu--mobile">
-  <li class="menu__trigger">Menu&nbsp;▾</li>
+  <li class="menu__trigger">Menü&nbsp;▾</li>
   <li>
     <ul class="menu__dropdown">
       
@@ -125,11 +125,11 @@
         <hr />
         
           <li>
-            <a href="/en/">English</a>
+            <a href='/en/tags/'>English</a>
           </li>
         
           <li>
-            <a href="/de/">Deutsch</a>
+            <a href='/de/tags/'>Deutsch</a>
           </li>
         
       
diff --git a/public/en/404.html b/public/en/404.html
index 161bc43..964ddf2 100644
--- a/public/en/404.html
+++ b/public/en/404.html
@@ -123,11 +123,11 @@
         <hr />
         
           <li>
-            <a href="/en/">English</a>
+            <a href='/en/404.html'>English</a>
           </li>
         
           <li>
-            <a href="/de/">Deutsch</a>
+            <a href='/de/404.html'>Deutsch</a>
           </li>
         
       
diff --git a/public/en/about/index.html b/public/en/about/index.html
index e91c4ce..05b1dde 100644
--- a/public/en/about/index.html
+++ b/public/en/about/index.html
@@ -131,11 +131,11 @@ Below you can read the original about from Radek
         <hr />
         
           <li>
-            <a href="/en/">English</a>
+            <a href='/en/about/'>English</a>
           </li>
         
           <li>
-            <a href="/de/">Deutsch</a>
+            <a href='/de/about/'>Deutsch</a>
           </li>
         
       
diff --git a/public/en/categories/index.html b/public/en/categories/index.html
index e15232e..da689cc 100644
--- a/public/en/categories/index.html
+++ b/public/en/categories/index.html
@@ -125,11 +125,11 @@
         <hr />
         
           <li>
-            <a href="/en/">English</a>
+            <a href='/en/categories/'>English</a>
           </li>
         
           <li>
-            <a href="/de/">Deutsch</a>
+            <a href='/de/categories/'>Deutsch</a>
           </li>
         
       
diff --git a/public/en/index.html b/public/en/index.html
index 9d00274..b6ac002 100644
--- a/public/en/index.html
+++ b/public/en/index.html
@@ -126,11 +126,11 @@
         <hr />
         
           <li>
-            <a href="/en/">English</a>
+            <a href='/en/'>English</a>
           </li>
         
           <li>
-            <a href="/de/">Deutsch</a>
+            <a href='/de/'>Deutsch</a>
           </li>
         
       
diff --git a/public/en/posts/index.html b/public/en/posts/index.html
index 4108ee5..bbfe7dd 100644
--- a/public/en/posts/index.html
+++ b/public/en/posts/index.html
@@ -125,11 +125,11 @@
         <hr />
         
           <li>
-            <a href="/en/">English</a>
+            <a href='/en/posts/'>English</a>
           </li>
         
           <li>
-            <a href="/de/">Deutsch</a>
+            <a href='/de/posts/'>Deutsch</a>
           </li>
         
       
diff --git a/public/en/posts/one-word/index.html b/public/en/posts/one-word/index.html
index cd504de..51ea293 100644
--- a/public/en/posts/one-word/index.html
+++ b/public/en/posts/one-word/index.html
@@ -125,11 +125,11 @@
         <hr />
         
           <li>
-            <a href="/en/">English</a>
+            <a href='/en/posts/one-word/'>English</a>
           </li>
         
           <li>
-            <a href="/de/">Deutsch</a>
+            <a href='/de/posts/one-word/'>Deutsch</a>
           </li>
         
       
diff --git a/public/en/posts/test-post/index.html b/public/en/posts/test-post/index.html
index a42cf49..61f86b8 100644
--- a/public/en/posts/test-post/index.html
+++ b/public/en/posts/test-post/index.html
@@ -127,11 +127,11 @@
         <hr />
         
           <li>
-            <a href="/en/">English</a>
+            <a href='/en/posts/test-post/'>English</a>
           </li>
         
           <li>
-            <a href="/de/">Deutsch</a>
+            <a href='/de/posts/test-post/'>Deutsch</a>
           </li>
         
       
diff --git a/public/en/tags/index.html b/public/en/tags/index.html
index adec792..e12e12a 100644
--- a/public/en/tags/index.html
+++ b/public/en/tags/index.html
@@ -125,11 +125,11 @@
         <hr />
         
           <li>
-            <a href="/en/">English</a>
+            <a href='/en/tags/'>English</a>
           </li>
         
           <li>
-            <a href="/de/">Deutsch</a>
+            <a href='/de/tags/'>Deutsch</a>
           </li>