diff --git a/src/layouts/LeftSidebarLayout.vue b/src/layouts/LeftSidebarLayout.vue
index ec2e7ad..7031e46 100644
--- a/src/layouts/LeftSidebarLayout.vue
+++ b/src/layouts/LeftSidebarLayout.vue
@@ -16,6 +16,7 @@ limitations under the License.
 
 <script setup>
 import Sidebar from '@/features/sidebar/components/Sidebar.vue';
+import SidebarExpandButton from '@/features/sidebar/components/SidebarExpandButton.vue';
 import { ref } from 'vue';
 
 const props = defineProps({
@@ -35,7 +36,10 @@ const toggleExpanded = function toggleExpanded () {
 
 <template>
     <div class="layout-container" :class="{ expanded }">
-        <Sidebar @toggle-expanded="toggleExpanded" :expanded="expanded">
+        <div class="sidebar-expand-button-container">
+            <SidebarExpandButton class="sidebar-expand-button" @click="toggleExpanded" />
+        </div>
+        <Sidebar @toggle-expanded="toggleExpanded" :expanded="expanded" class="sidebar">
             <slot name="sidebar" />
         </Sidebar>
         <main class="main-content">
@@ -48,6 +52,10 @@ const toggleExpanded = function toggleExpanded () {
 .layout-container {
     display: grid;
     grid-template-columns: 72px 1fr;
+    grid-template-rows: auto 1fr;
+    grid-template-areas:
+        "sidebar-expand sidebar-expand"
+        "sidebar main-content";
     border-top: 1px solid var(--border);
 }
 
@@ -55,6 +63,15 @@ const toggleExpanded = function toggleExpanded () {
     grid-template-columns: min(24%, 280px) 1fr;
 }
 
+.sidebar-expand-button-container {
+    grid-area: sidebar-expand;
+    display: none;
+}
+
+.sidebar {
+    grid-area: sidebar;
+}
+
 @media (max-width: 48rem) {
     .layout-container {
         grid-template-columns: 0 1fr;
@@ -63,9 +80,20 @@ const toggleExpanded = function toggleExpanded () {
     .layout-container.expanded {
         grid-template-columns: 1fr 0;
     }
+    
+    .layout-container:not(.expanded) .sidebar-expand-button-container {
+        justify-content: end;
+        display: block;
+        padding: 20px;
+    }
+
+    .layout-container:not(.expanded) .main-content {
+        padding-top: 0;
+    }
 }
 
 .main-content {
+    grid-area: main-content;
     padding: 20px;
 }
 </style>
\ No newline at end of file