diff --git a/resources/assets/stylesheets/scss/layouts.scss b/resources/assets/stylesheets/scss/layouts.scss
index 46689d537c0ea648d7e0f16d26e620794e151a5e..94b26fb92391dc735ea07db69ee15dc912b1d8ac 100644
--- a/resources/assets/stylesheets/scss/layouts.scss
+++ b/resources/assets/stylesheets/scss/layouts.scss
@@ -26,7 +26,7 @@ body {
     display: grid;
     grid-column-gap: 5px;
     grid-row-gap: $grid-gap;
-    grid-template-columns: ($sidebar-width + $sidebar-padding) 1fr;
+    grid-template-columns: ($sidebar-width + $sidebar-padding) minmax(auto, calc(100vw - $sidebar-width - $sidebar-padding));
     grid-template-rows: auto 1fr $footer-height;
 
     &::backdrop {
@@ -56,11 +56,6 @@ body {
     min-width: $site-width;
     width: 100%;
 
-    > ul {
-        flex: 0 0 auto;
-        height: 55px;
-    }
-
     #top-logo {
         flex: 0 1 auto;
         margin-right: 12px;
@@ -68,6 +63,11 @@ body {
     }
 }
 
+#navigation-level-1-items {
+    flex: 1;
+    height: 55px;
+}
+
 /* --- Layouts -------------------------------------------------------------- */
 #current-page-structure {
     background-color: #fff;
@@ -161,6 +161,7 @@ body {
     grid-row: 2 / 3;
     justify-content: flex-start;
     margin: $page-margin;
+    overflow-x: auto;
     position: relative;
     vertical-align: top;