diff --git a/src/index.html b/src/index.html
index 99014119a..72a76e33d 100644
--- a/src/index.html
+++ b/src/index.html
@@ -106,7 +106,7 @@
             <!-- Main row -->
             <section class="row">
               <!-- Start col -->
-              <section class="col-lg-7">
+              <div class="col-lg-7">
                 <!-- Custom tabs (Charts with tabs)-->
                 <div class="card">
                   <div class="card-header">
@@ -341,7 +341,7 @@
                   <!-- /.card-footer-->
                 </div>
                 <!--/.direct-chat -->
-              </section>
+              </div>
               <!-- /.Start col -->
             </section>
             <!-- /.row (main row) -->
diff --git a/src/partials/dashboard/_topbar.html b/src/partials/dashboard/_topbar.html
index 09fae677c..1edb2f227 100644
--- a/src/partials/dashboard/_topbar.html
+++ b/src/partials/dashboard/_topbar.html
@@ -151,7 +151,8 @@
           </li>
         </ul>
       </li>
-      <li class="nav-item">
+      <!-- TODO tackel in v4.1 -->
+      <!-- <li class="nav-item">
         <a class="nav-link" data-widget="fullscreen" href="#" role="button">
           <i class="fas fa-expand-arrows-alt"></i>
         </a>
@@ -160,7 +161,7 @@
         <a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button">
           <i class="fas fa-th-large"></i>
         </a>
-      </li>
+      </li> -->
     </ul>
   </div>
 </nav>
diff --git a/src/scss/_wrapper.scss b/src/scss/_wrapper.scss
index 6d694ebec..8c727d6a4 100644
--- a/src/scss/_wrapper.scss
+++ b/src/scss/_wrapper.scss
@@ -12,7 +12,7 @@
     "main-sidebar main-header"
     "main-sidebar content-wrapper"
     "main-sidebar main-footer";
-  grid-template-columns: auto 1fr;
-  grid-template-rows: auto 1fr auto;
+  grid-template-columns: auto minmax(100%, max-content);
+  grid-template-rows: min-content 100% min-content;
   min-height: 100vh;
 }
diff --git a/src/ts/push-menu.ts b/src/ts/push-menu.ts
index 34de3cfcd..c7bcf8ebf 100644
--- a/src/ts/push-menu.ts
+++ b/src/ts/push-menu.ts
@@ -130,11 +130,15 @@ class PushMenu {
 
   addSidebaBreakPoint(): void {
     const bodyClass = document.body.classList
-    const widthOutput: number = window.innerWidth
+    const widthOutput = window.innerWidth
+
+    if (widthOutput < Defaults.onLayouMobile) {
+      bodyClass.add(CLASS_NAME_LAYOUT_MOBILE)
+    }
+
     if (widthOutput >= Defaults.onLayouMobile) {
       bodyClass.remove(CLASS_NAME_LAYOUT_MOBILE)
-    } else {
-      bodyClass.add(CLASS_NAME_LAYOUT_MOBILE)
+      this.expand()
     }
   }