diff --git a/themes/buha/assets/css/layout.css b/themes/buha/assets/css/layout.css
index 8bf76d66..7fd0acb7 100644
--- a/themes/buha/assets/css/layout.css
+++ b/themes/buha/assets/css/layout.css
@@ -13,7 +13,21 @@
 	background-image: linear-gradient(var(--background-alt), var(--background));
 }
 
+details {
+	margin-top: 0;
+}
 
+summary {
+	background-color: var(--background-alt);
+}
+
+details p, details section {
+	text-align: right;
+}
+
+aside {
+	display: none;
+}
 
 main h1 {
 	margin-top: 0rem;
@@ -21,7 +35,7 @@ main h1 {
 }
 
 .right-sidebar {
-	display: flex;
+	display: none;
 	flex-direction: row;
 	margin-left: 1rem;
 }
@@ -137,6 +151,10 @@ article h3 {
 
 /* Small devices (portrait tablets and large phones, 600px and up) */
 @media only screen and (min-width: 600px) {
+	details {
+		display: none;
+	}
+
 	#headerinner {
 		padding: 10px;
 	}
@@ -153,6 +171,7 @@ article h3 {
 	}
 
 	.right-sidebar {
+		display: flex;
 		flex-shrink: 0;
 		flex-grow: 0;
 		margin-left: 2rem;
diff --git a/themes/buha/layouts/_default/baseof.html b/themes/buha/layouts/_default/baseof.html
index 59ad4c6f..e5ebb3d4 100644
--- a/themes/buha/layouts/_default/baseof.html
+++ b/themes/buha/layouts/_default/baseof.html
@@ -5,10 +5,10 @@
         <div class="container">
                 <header>
                     {{ partialCached "header" . }}
-                </header>
-                 <div style="display: flex; justify-content: flex-end; flex-direction: row; height: 1rem;">
+                 <div>
                     {{ block "nav2" . -}}{{- end }}
                 </div>
+                </header>
                 <div class="content">
                     <main>
                         <h1>
@@ -16,7 +16,9 @@
                         </h1>
                         {{ block "main" . -}}{{- end }}
                     </main>
+                    <aside class="right-sidebar">
                     {{ block "sidebar" . -}}{{- end }}
+                    </aside>
                 </div>
                 <footer>
                     {{- partial "footer" . -}}
diff --git a/themes/buha/layouts/_default/list.html b/themes/buha/layouts/_default/list.html
index 6e0daf1c..25cb8e38 100644
--- a/themes/buha/layouts/_default/list.html
+++ b/themes/buha/layouts/_default/list.html
@@ -164,6 +164,10 @@
 {{- end -}}
 
 {{ define "nav2" }}
+
+        <details>
+        	<summary style="list-style: none; text-align: right;">☰</summary>
+        	<p>
         {{ $true := false }}
         {{ range $taxonomyname, $taxonomy := where .Site.Taxonomies.categories ".Page.Section" .Section }}
           {{ if ne $taxonomyname nil }}
@@ -174,7 +178,10 @@
         {{ range $taxonomyname, $taxonomy := where .Site.Taxonomies.categories ".Page.Section" .Section }}
            <a href="{{ "categories/" | relLangURL}}{{ $taxonomyname | urlize }}" style="margin-right: 1rem">{{ $taxonomyname | humanize }}</a>
         {{ end }}
-        {{ end }}
+        {{ end }}        		
+        		{{ partial "sidebar.html" . }}
+        	</p>
+        </details>
 {{ end }}
 
 {{ define "sidebar" }}
diff --git a/themes/buha/layouts/index.html b/themes/buha/layouts/index.html
index ace29d99..639fbecd 100644
--- a/themes/buha/layouts/index.html
+++ b/themes/buha/layouts/index.html
@@ -159,6 +159,27 @@
 
 {{ end }}
 
+{{ define "nav2" }}
+
+        <details>
+        	<summary style="list-style: none; text-align: right;">☰</summary>
+        	<p>
+        {{ $true := false }}
+        {{ range $taxonomyname, $taxonomy := where .Site.Taxonomies.categories ".Page.Section" .Section }}
+          {{ if ne $taxonomyname nil }}
+            {{ $true = true }}
+          {{ end }}
+        {{ end }}
+        {{ if $true }}
+        {{ range $taxonomyname, $taxonomy := where .Site.Taxonomies.categories ".Page.Section" .Section }}
+           <a href="{{ "categories/" | relLangURL}}{{ $taxonomyname | urlize }}" style="margin-right: 1rem">{{ $taxonomyname | humanize }}</a>
+        {{ end }}
+        {{ end }}        		
+        		{{ partial "sidebar.html" . }}
+        	</p>
+        </details>
+{{ 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 c5cac3a7..270d9149 100644
--- a/themes/buha/layouts/partials/sidebar.html
+++ b/themes/buha/layouts/partials/sidebar.html
@@ -1,4 +1,3 @@
-<aside class="right-sidebar">
 {{ $s := .Site.Params }}
   <section class="sidebar_inner">
     <div id="nav-posts">
@@ -39,4 +38,3 @@
 
   </section>
 
-</aside>
\ No newline at end of file