diff --git a/pages/_data/menu.yml b/pages/_data/menu.yml
index d9387751e486b7f0e9e5e4ac9af467bf62c7edc5..01cb5d4f8f9262a7580060e2666d471e710ffc7f 100644
--- a/pages/_data/menu.yml
+++ b/pages/_data/menu.yml
@@ -20,16 +20,19 @@ layout:
   children:
     sidebar-left:
       title: Left sidebar
-      url: navbar-left.html
+      url: layout-navbar-left.html
     sidebar-right:
       title: Right sidebar
-      url: navbar-right.html
+      url: layout-navbar-right.html
     navbar-top:
       title: Navbar top
-      url: navbar-top.html
+      url: layout-navbar-top.html
     header-dark:
       title: Dark header
-      url: header-dark.html
+      url: layout-header-dark.html
+    dark-mode:
+      title: Dark mode
+      url: layout-dark-mode.html
 
 docs:
   title: Documentation
diff --git a/pages/_includes/layout/sidenav.html b/pages/_includes/layout/sidenav.html
index 295610aa6bc858799d1c477542abc20f784159e3..32331338a6cc769589c14348a2bd63e5e2073f7e 100644
--- a/pages/_includes/layout/sidenav.html
+++ b/pages/_includes/layout/sidenav.html
@@ -1,4 +1,4 @@
 {% assign menu = page.menu | default: layout.menu %}
-<div class="navbar navbar-side{% if page.nav-position == 'right' %} navbar-right{% endif %} navbar-expand-md">
+<div class="navbar navbar-side{% if include.dark %} navbar-dark{% endif %}{% if page.nav-position == 'right' %} navbar-right{% endif %} navbar-expand-md">
    {% include layout/sidenav-content.html menu=menu %}
 </div>
diff --git a/pages/_layouts/default.html b/pages/_layouts/default.html
index ab0f1538a6120c30b2a5cbbb99ec220e55932494..e4363181690ff8df54c6f79c0c458784053ddd63 100644
--- a/pages/_layouts/default.html
+++ b/pages/_layouts/default.html
@@ -2,25 +2,27 @@
 layout: base
 ---
 
-<div class="d-flex h-auto min-h-screen flex-wrap flex-column">
+<div class="d-flex h-auto min-h-screen">
+   <div class="d-flex flex-fill">
+      {% if page.nav-position == "left" or page.nav-position == "right" or page.nav-position == "all"  %}
+      {% include layout/sidenav.html dark=true  %}
+      {% endif %}
 
-   {% if page.nav-position == "left" or page.nav-position == "right" or page.nav-position == "all"  %}
-   {% include layout/sidenav.html %}
-   {% endif %}
+      <div class="main-content flex-fill d-flex flex-column mw-100">
+         {% include layout/topnav.html dark=page.header-dark %}
 
-   {% include layout/topnav.html dark=page.header-dark %}
+         <div class="d-flex flex-fill">
 
-   <div class="main-content flex-fill d-flex flex-column mw-100">
+            <div class="flex-fill px-lg-2 mw-100{% if page.blank %} d-flex align-items-center{% endif %}">
+               <div class="container{% if page.container-size %} container-{{ page.container-size }}{% endif %}{% if page.fluid %}-fluid{% endif %} my-4">
+                  {% include layout/page-title.html %}
 
-      <div class="d-flex flex-fill">
-
-         <div class="flex-fill px-lg-2 mw-100{% if page.blank %} d-flex align-items-center{% endif %}">
-            <div class="container{% if page.container-size %} container-{{ page.container-size }}{% endif %}{% if page.fluid %}-fluid{% endif %} my-4">
-               {% include layout/page-title.html %}
-
-               {{ content }}
+                  {{ content }}
+               </div>
             </div>
          </div>
       </div>
    </div>
+
+
 </div>
diff --git a/pages/layout-dark-mode.html b/pages/layout-dark-mode.html
new file mode 100644
index 0000000000000000000000000000000000000000..45ced9555ce4384d548191cdf9b8060abe0ff859
--- /dev/null
+++ b/pages/layout-dark-mode.html
@@ -0,0 +1,4 @@
+---
+title: Dark mode
+dark-theme: true
+---
diff --git a/pages/header-dark.html b/pages/layout-header-dark.html
similarity index 100%
rename from pages/header-dark.html
rename to pages/layout-header-dark.html
diff --git a/pages/navbar-all.html b/pages/navbar-all.html
deleted file mode 100644
index ff91ed625316614e5c15284bc2f0620f97a63abe..0000000000000000000000000000000000000000
--- a/pages/navbar-all.html
+++ /dev/null
@@ -1,25 +0,0 @@
----
-nav-position: all
----
-
-<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
-
-<p>Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.</p>
-
-<p>Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.</p>
-
-<p>Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.</p>
-
-<p>Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.</p>
-
-<p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.</p>
-
-<p>Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.</p>
-
-<p>Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.</p>
-
-<p>Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.</p>
-
-<p>Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.</p>
-
-<p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.</p>
diff --git a/pages/navbar-left.html b/pages/navbar-left.html
deleted file mode 100644
index f3fa0309ca09dbbb0057fef820aa0612e0964048..0000000000000000000000000000000000000000
--- a/pages/navbar-left.html
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Sidebar left
-menu: layout.sidebar-left
-nav-position: left
----
diff --git a/pages/navbar-right.html b/pages/navbar-right.html
deleted file mode 100644
index 6777193b3145ca13e75503dab0084895edf38e03..0000000000000000000000000000000000000000
--- a/pages/navbar-right.html
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Sidebar right
-menu: layout.sidebar-right
-nav-position: right
----
diff --git a/pages/navbar-top.html b/pages/navbar-top.html
deleted file mode 100644
index aaac910898b432a521ad2047fcb18493322e8069..0000000000000000000000000000000000000000
--- a/pages/navbar-top.html
+++ /dev/null
@@ -1,3 +0,0 @@
----
-title: Navbar top
----
diff --git a/scss/layout/_navbar.scss b/scss/layout/_navbar.scss
index 48bb7ff1de7406c1743b51bb83e349833090f54d..39f606ce88c4375ee19036b89b9b4d221e098a09 100644
--- a/scss/layout/_navbar.scss
+++ b/scss/layout/_navbar.scss
@@ -5,7 +5,7 @@
   border-bottom: 1px solid $border-color;
   display: flex;
   min-height: 3.5rem;
-  padding: .75rem 1rem;
+  padding: .75rem .75rem;
   width: 100%;
 
   .nav-link {
@@ -42,7 +42,7 @@
   }
 }
 
-.navbar-subnav {
+.navbar:not(.navbar-side) .navbar-subnav {
   position: absolute;
   top: 100%;
   left: 0;
@@ -122,6 +122,12 @@ Sidebar
   background: $sidenav-bg;
   border-right: 1px solid $sidenav-border-color;
   user-select: none;
+  flex-direction: column;
+  align-items: inherit;
+
+  .nav {
+    flex-direction: column;
+  }
 
   .nav-link {
     display: flex;