diff --git a/assets/css/admin.scss b/assets/css/admin.scss
index f904dcf..07189e7 100644
--- a/assets/css/admin.scss
+++ b/assets/css/admin.scss
@@ -126,6 +126,9 @@ tr.table-primary-light {
 
 
 .sidebar {
+    width: 260px;
+    display: inline-block;
+
     .nav-link {
         font-weight: 500;
         color: #333;
@@ -152,32 +155,6 @@ tr.table-primary-light {
         text-transform: uppercase;
         display: flex;
     }
-
-    @media screen and (max-width: 1130px) {
-        .nav-link {
-            font-size: 14px;
-        }
-    }
-
-    @media screen and (max-width: 770px) {
-        .nav {
-            padding-left: 0;
-        }
-
-        .nav-link {
-            padding-left: 10px;
-        }
-
-        .nav-item-label {
-            display: none;
-        }
-
-        .sidebar-heading {
-            display: none;
-        }
-
-        width: 50px;
-    }
 }
 
 *[data-selectable-selector] {
@@ -204,15 +181,19 @@ tr.table-primary-light {
 
 .body {
     padding-top: 60px;
+    width: calc(100vw - 260px);
+    margin-left: 260px;
+    display: inline-block;
 
     .nav {
         padding-left: 10px;
     }
 }
 
-@media screen and (max-width: 580px) {
+@media screen and (max-width: 770px) {
     .body {
-        margin-left: 45px;
+        margin-left: 50px;
+        width: calc(100vw - 50px);
     }
 
     .sidebar {
@@ -223,6 +204,22 @@ tr.table-primary-light {
             width: 50px;
             max-width: 100% !important;
         }
+
+        .nav {
+            padding-left: 0;
+        }
+
+        .nav-link {
+            padding-left: 10px;
+        }
+
+        .nav-item-label {
+            display: none;
+        }
+
+        .sidebar-heading {
+            display: none;
+        }
     }
 }
 
diff --git a/core/Resources/views/admin/layout.html.twig b/core/Resources/views/admin/layout.html.twig
index b168ae9..d8dd78f 100644
--- a/core/Resources/views/admin/layout.html.twig
+++ b/core/Resources/views/admin/layout.html.twig
@@ -27,16 +27,14 @@
 
         {% block body_container %}
             <div class="container-fluid">
-                <div class="row">
-                    <nav class="col-md-2 col-1 d-md-block bg-dark-blue sidebar">
-                        <div class="sidebar-sticky">
-                            {{ include('@Core/admin/module/menu.html.twig') }}
-                        </div>
-                    </nav>
-                    <div class="col-11 col-md-10 ml-sm-auto col-lg-10 body">
-                        {% block body %}
-                        {% endblock %}
+                <nav class="bg-dark-blue sidebar">
+                    <div class="sidebar-sticky">
+                        {{ include('@Core/admin/module/menu.html.twig') }}
                     </div>
+                </nav>
+                <div class="body">
+                    {% block body %}
+                    {% endblock %}
                 </div>
             </div>
         {% endblock %}