diff --git a/themes/cosin-theme/layouts/_default/baseof.html b/themes/cosin-theme/layouts/_default/baseof.html
index 9dff456..5cae779 100644
--- a/themes/cosin-theme/layouts/_default/baseof.html
+++ b/themes/cosin-theme/layouts/_default/baseof.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
-<html lang='{{ .Site.Language.Lang | default "de" }}'>
+<html lang='{{ .Site.Language.Lang }}'>
   <head>
-    <title>{{ block "title" . }}{{ .Site.Title }}{{ with .Title }} | {{ . }}{{ end }}{{ end }}</title>
+    <title>{{ .Site.Title }} | {{ .Page.Title }}</title>
 
     <meta charset="utf-8">
     {{ .Hugo.Generator }}
@@ -10,27 +10,23 @@
   </head>
 
   <body>
-
     {{ block "header" . }} {{ partial "site-header.html" . }} {{ end }}
     {{ block "menu" . }} {{ partial "site-menu.html" . }} {{ end }}
 
     <div id="content">
-      {{ block "sidebar" . }}
-        {{ if eq .Site.Language.Lang "de" }}
-          {{ partial "site-sidebar.de.html" . }}
-        {{ else if eq .Site.Language.Lang "fr" }}
-          {{ partial "site-sidebar.fr.html" . }}
-        {{ else if eq .Site.Language.Lang "it" }}
-          {{ partial "site-sidebar.it.html" . }}
-        {{ else if eq .Site.Language.Lang "en" }}
-          {{ partial "site-sidebar.en.html" . }}
-        {{ end }}
+      {{ if eq .Site.Language.Lang "de" }}
+        {{ partial "site-sidebar.de.html" . }}
+      {{ else if eq .Site.Language.Lang "fr" }}
+        {{ partial "site-sidebar.fr.html" . }}
+      {{ else if eq .Site.Language.Lang "it" }}
+        {{ partial "site-sidebar.it.html" . }}
+      {{ else if eq .Site.Language.Lang "en" }}
+        {{ partial "site-sidebar.en.html" . }}
       {{ end }}
       {{ block "main" . }} {{ end }}
       <div style="clear: both;"></div>
     </div>
 
     {{ block "footer" . }} {{ partial "site-footer.html" . }} {{ end }}
-
   </body>
 </html>
diff --git a/themes/cosin-theme/layouts/_default/single.html b/themes/cosin-theme/layouts/_default/single.html
index c7e9399..3f3cb21 100644
--- a/themes/cosin-theme/layouts/_default/single.html
+++ b/themes/cosin-theme/layouts/_default/single.html
@@ -1,11 +1,7 @@
 {{ define "main" }}
 <div class="right">
   <article>
-    <header>
-    </header>
-    <div>
-      {{ .Content }}
-    </div>
+    {{ .Content }}
   </article>
 </div>
 {{ end }}
diff --git a/themes/cosin-theme/layouts/index.html b/themes/cosin-theme/layouts/index.html
index c7e9399..3f3cb21 100644
--- a/themes/cosin-theme/layouts/index.html
+++ b/themes/cosin-theme/layouts/index.html
@@ -1,11 +1,7 @@
 {{ define "main" }}
 <div class="right">
   <article>
-    <header>
-    </header>
-    <div>
-      {{ .Content }}
-    </div>
+    {{ .Content }}
   </article>
 </div>
 {{ end }}
diff --git a/themes/cosin-theme/layouts/partials/fahrplan.de.html b/themes/cosin-theme/layouts/partials/fahrplan.de.html
index f33cc50..104f818 100644
--- a/themes/cosin-theme/layouts/partials/fahrplan.de.html
+++ b/themes/cosin-theme/layouts/partials/fahrplan.de.html
@@ -9,4 +9,4 @@
   <p>
     Der Fahrplan für die diesjährige CoSin erscheint Anfang Juni.
   </p>
-{{ end}}
+{{ end }}
diff --git a/themes/cosin-theme/layouts/partials/fahrplan.en.html b/themes/cosin-theme/layouts/partials/fahrplan.en.html
index c7f902d..7e2728a 100644
--- a/themes/cosin-theme/layouts/partials/fahrplan.en.html
+++ b/themes/cosin-theme/layouts/partials/fahrplan.en.html
@@ -9,4 +9,4 @@
   <p>
     Schedule of this year's CoSin will be online in early June.
   </p>
-{{ end}}
+{{ end }}
diff --git a/themes/cosin-theme/layouts/partials/fahrplan.fr.html b/themes/cosin-theme/layouts/partials/fahrplan.fr.html
index f33cc50..104f818 100644
--- a/themes/cosin-theme/layouts/partials/fahrplan.fr.html
+++ b/themes/cosin-theme/layouts/partials/fahrplan.fr.html
@@ -9,4 +9,4 @@
   <p>
     Der Fahrplan für die diesjährige CoSin erscheint Anfang Juni.
   </p>
-{{ end}}
+{{ end }}
diff --git a/themes/cosin-theme/layouts/partials/fahrplan.it.html b/themes/cosin-theme/layouts/partials/fahrplan.it.html
index f33cc50..104f818 100644
--- a/themes/cosin-theme/layouts/partials/fahrplan.it.html
+++ b/themes/cosin-theme/layouts/partials/fahrplan.it.html
@@ -9,4 +9,4 @@
   <p>
     Der Fahrplan für die diesjährige CoSin erscheint Anfang Juni.
   </p>
-{{ end}}
+{{ end }}
