diff --git a/frontend/resources/styles/main/partials/sidebar-sitemap.scss b/frontend/resources/styles/main/partials/sidebar-sitemap.scss
index 69703eb86..301b40c80 100644
--- a/frontend/resources/styles/main/partials/sidebar-sitemap.scss
+++ b/frontend/resources/styles/main/partials/sidebar-sitemap.scss
@@ -7,7 +7,6 @@
 
 .sitemap {
   flex: none !important;
-  max-height: 190px;
 
   .element-list {
 
diff --git a/frontend/resources/styles/main/partials/sidebar.scss b/frontend/resources/styles/main/partials/sidebar.scss
index 12dfc127b..73d55a0a9 100644
--- a/frontend/resources/styles/main/partials/sidebar.scss
+++ b/frontend/resources/styles/main/partials/sidebar.scss
@@ -22,18 +22,35 @@
     align-items: center;
     display: grid;
     grid-template-columns: 100%;
-    
+
+    &[data-layout*='sitemap-pages'] {
+        grid-template-rows: auto;
+    }
+
     &[data-layout*='layers'] {
-        grid-template-rows: 30% 70%;
+        grid-template-rows: auto 1fr;
     }
 
     &[data-layout*='libraries'] {
-        grid-template-rows: 100%;
+        grid-template-rows: auto 1fr;
+    }
+
+    &[data-layout*='layers'][data-layout*='sitemap-pages'] {
+        grid-template-rows: 12rem 1fr;
+    }
+
+    &[data-layout*='libraries'][data-layout*='sitemap-pages'] {
+        grid-template-rows: 12rem 1fr;
     }
 
     &[data-layout*='layers'][data-layout*='libraries'] {
-        grid-template-rows: 15% 25% 60%;
+        grid-template-rows: auto 30% 1fr;
     }
+
+    &[data-layout*='layers'][data-layout*='libraries'][data-layout*='sitemap-pages'] {
+        grid-template-rows: 12rem 25% 1fr;
+    }
+
     
     flex-direction: column;
     overflow: hidden;
diff --git a/frontend/src/uxbox/main/ui/workspace/left_toolbar.cljs b/frontend/src/uxbox/main/ui/workspace/left_toolbar.cljs
index 3e3cdb29e..af84435fc 100644
--- a/frontend/src/uxbox/main/ui/workspace/left_toolbar.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/left_toolbar.cljs
@@ -68,7 +68,7 @@
        [:li.tooltip.tooltip-right
         {:alt "Layers"
          :class (when (contains? layout :layers) "selected")
-         :on-click #(st/emit! (dw/toggle-layout-flag :layers :sitemap))}
+         :on-click #(st/emit! (dw/toggle-layout-flag :layers))}
         i/layers]
        [:li.tooltip.tooltip-right
         {:alt "Libraries"