diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index d50d96608..dcb089ace 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -12,32 +12,24 @@ body {
 
 #layout {
   height: 100%;
+  display: flex;
+  flex-direction: column;
   // Prevent nav-level-2 flyovers from being covered by #main
   z-index: 0;
 }
 
-#header {
-  width: 100%;
-  padding-bottom: 3em;
-  position: fixed;
-  left: 0;
-  top: 0;
+#content-wrapper {
+  flex: 1;
+  display: flex;
+
 }
 
 #sidebar {
   width: 12em;
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  top: 4.5em;
 }
 
 #main {
-  position: fixed;
-  bottom: 0;
-  left: 12em;
-  right: 0;
-  top: 2.25em;
+  flex: 1;
 }
 
 .iframe {