diff --git a/assets/css/main.css b/assets/css/main.css
index 1d94953..23df334 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -281,6 +281,16 @@ main h1 {
 
 /* Articles */
 
+.post-header {
+    margin-top: 1em;
+    line-height: 1.1em;
+    margin-bottom: 1em;
+}
+
+.post-header header {
+    display: inline;
+}
+
 .post-navigation {
     background: var(--nav-bg-color);
     text-align: center;
@@ -331,12 +341,6 @@ article:not(:last-of-type) {
     padding-bottom: 2em;
 }
 
-article header {
-    margin-top: 1em;
-    line-height: 1.1em;
-    margin-bottom: 1em;
-}
-
 
 article header h1 {
     font-size: 1.35em;
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index cb1b757..02500a2 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -8,10 +8,12 @@
         {{ $pages := where .Pages "Type" "in" site.Params.mainSections }}
         {{ range $pages }}
             <div class="post-short-list h-entry">
-                <header class="post-header"> 
-                    <h2 class="p-name post-title{{ if .Params.favorite }} favorite{{end}}{{ if .Params.draft }} draft{{end}}"><a class="u-url" href="{{ .RelPermalink }}">{{ trim .Title " " }}</a></h2>
-                    {{ partial "post-language-switcher.html" . }}
-                </header>
+                <div class="post-header">
+                    <header> 
+                        <h2 class="p-name post-title{{ if .Params.favorite }} favorite{{end}}{{ if .Params.draft }} draft{{end}}"><a class="u-url" href="{{ .RelPermalink }}">{{ trim .Title " " }}</a></h2>
+                        {{ partial "post-language-switcher.html" . }}
+                    </header>
+                </div>
                 {{ partial "post-info.html" . }}
             </div>
         {{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 94a711e..44cf703 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -8,11 +8,13 @@
     {{ end }}
 
     <article class="post h-entry">
-        <header class="post-header">
-            <h1 class="p-name post-title{{ if .Params.favorite }} favorite{{end}}{{ if .Params.draft }} draft{{end}}">{{ trim .Title  " " }}</h1>
+        <div class="post-header">
+            <header>
+                <h1 class="p-name post-title{{ if .Params.favorite }} favorite{{end}}{{ if .Params.draft }} draft{{end}}">{{ trim .Title  " " }}</h1>
 
-            {{ partial "post-language-switcher.html" . }}
-        </header>
+                {{ partial "post-language-switcher.html" . }}
+            </header>
+        </div>
         <div class="content e-content">
             {{ .Content }}
         </div>
diff --git a/layouts/partials/post-language-switcher.html b/layouts/partials/post-language-switcher.html
index 162cdf3..3ed363e 100644
--- a/layouts/partials/post-language-switcher.html
+++ b/layouts/partials/post-language-switcher.html
@@ -1,16 +1,18 @@
 {{ if .IsTranslated }}
     {{ $pageLang := .Page.Lang}}
-    <ul class="post-translations">
-        {{ range .AllTranslations }}
-            {{ if eq .Lang $pageLang }}
-                <li>
-                    {{ upper .Lang }}
-                </li>
-            {{ else }}
-                <li>
-                    <a href="{{ .Permalink }}">{{ upper .Lang }}</a>
-                </li>
+    <span>
+        <ul class="post-translations">
+            {{ range .AllTranslations }}
+                {{ if eq .Lang $pageLang }}
+                    <li>
+                        {{ upper .Lang }}
+                    </li>
+                {{ else }}
+                    <li>
+                        <a href="{{ .Permalink }}">{{ upper .Lang }}</a>
+                    </li>
+                {{ end }}
             {{ end }}
-        {{ end }}
-    </ul>
+        </ul>
+    </span>
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/post-summary.html b/layouts/partials/post-summary.html
index 7961f62..618c280 100644
--- a/layouts/partials/post-summary.html
+++ b/layouts/partials/post-summary.html
@@ -1,8 +1,10 @@
 <article class="post-list h-feed">
-    <header class="post-header">
-        <h1 class="p-name post-title{{ if .Params.favorite }} favorite{{end}}{{ if .Params.draft }} draft{{end}}"><a class="u-url" href="{{ .RelPermalink }}">{{ trim .Title " " }}</a></h1>
+    <div class="post-header">
+        <header>
+            <h1 class="p-name post-title{{ if .Params.favorite }} favorite{{end}}{{ if .Params.draft }} draft{{end}}"><a class="u-url" href="{{ .RelPermalink }}">{{ trim .Title " " }}</a></h1>
+        </header>
         {{ partial "post-language-switcher.html" . }}
-    </header>
+    </div>
 
     {{ if not .Site.Params.disableSummary }}
         <div class="content post-summary p-summary">