diff --git a/themes/buha/layouts/_default/baseof.html b/themes/buha/layouts/_default/baseof.html
index 50301d8d..36351957 100644
--- a/themes/buha/layouts/_default/baseof.html
+++ b/themes/buha/layouts/_default/baseof.html
@@ -13,9 +13,7 @@
                         </h1>
                         {{ block "main" . -}}{{- end }}
                     </main>
-                    <aside class="right-sidebar">
-                        {{- partial "sidebar" . }}
-                    </aside>
+                    {{ block "sidebar" . -}}{{- end }}
                 </div>
                 <footer>
                     {{- partial "footer" . -}}
diff --git a/themes/buha/layouts/_default/list.html b/themes/buha/layouts/_default/list.html
index e2ca0a42..3e0d8e2b 100644
--- a/themes/buha/layouts/_default/list.html
+++ b/themes/buha/layouts/_default/list.html
@@ -163,3 +163,7 @@
 			{{ end }}
 		</div>
 {{- end -}}
+
+{{ define "sidebar" }}
+	{{- partial "sidebar" . }}
+{{ end }}
\ No newline at end of file
diff --git a/themes/buha/layouts/_default/single.html b/themes/buha/layouts/_default/single.html
index e346b417..276ebde4 100644
--- a/themes/buha/layouts/_default/single.html
+++ b/themes/buha/layouts/_default/single.html
@@ -1,5 +1,4 @@
 {{ define "title" }}
-	{{ if and (isset .Params "categories") (eq .Section "events") }}{{ index .Params.categories 0 }}: {{ end }}{{- .Title -}}
 {{ end }}
 
 {{ define "main" }}
@@ -24,7 +23,7 @@
     {{ end }}
 
 {{ else }}
-	<article>
+	<h1>{{ if and (isset .Params "categories") (eq .Section "events") }}{{ index .Params.categories 0 }}: {{ end }}{{- .Title -}}</h1>
 		{{ if and (ne .Params.when "") (ne .Params.when nil) }}
 			<div style="margin-bottom: .4em;"><b>{{ .Params.when }}</b></div>
 		{{ end }}
@@ -55,6 +54,5 @@
 			    {{- .Content -}}
 			</div>
 		</div>
-	</article>
 {{ end }}
 {{ end }}
diff --git a/themes/buha/layouts/index.html b/themes/buha/layouts/index.html
index 11921e77..ae22f67c 100644
--- a/themes/buha/layouts/index.html
+++ b/themes/buha/layouts/index.html
@@ -3,10 +3,10 @@
 {{ end }}
 
 {{ define "main" }}
-<article>
-	{{ .Content }}
 
-</article>
+{{ .Content }}
+
+<h2>{{ "news" | T }}</h2>
 	{{ $s := .Site.Params }}
     {{- $posts := where (where .Site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" $s.mainSections }}
 	{{- $paginator := slice -}}
@@ -160,3 +160,7 @@
 		</div>
 
 {{ end }}
+
+{{ define "sidebar" }}
+	{{- partial "sidebar" . }}
+{{ end }}
\ No newline at end of file
diff --git a/themes/buha/layouts/partials/sidebar.html b/themes/buha/layouts/partials/sidebar.html
index e8afd3d0..d1acbe7e 100644
--- a/themes/buha/layouts/partials/sidebar.html
+++ b/themes/buha/layouts/partials/sidebar.html
@@ -1,3 +1,4 @@
+<aside class="right-sidebar">
 {{ $s := .Site.Params }}
   <section class="sidebar_inner">
     <div id="nav-posts">
@@ -40,3 +41,4 @@
 
   </section>
 
+</aside>
\ No newline at end of file