diff --git a/app/templates/base.html b/app/templates/base.html
index 05697b7..47d8fa8 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -335,10 +335,9 @@
     </div><!-- /sidebar-scroll -->
   </aside>
 
-  <!-- Uncollapse button (visible when sidebar hidden) -->
-  <button class="sidebar-uncollapse-btn" x-show="sidebarCollapsed" x-cloak @click="sidebarCollapsed = false" title="Show sidebar">
-    <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="3" y1="6" x2="21" y2="6"/><line x1="3" y1="12" x2="21" y2="12"/><line x1="3" y1="18" x2="21" y2="18"/></svg>
-  </button>
+  <!-- Uncollapse button → inside topbar, no overlap -->
+  <!-- (Moved into topbar block below) -->
+
 
   <style>
     [x-cloak] { display: none !important; }
@@ -350,8 +349,8 @@
     <!-- Topbar -->
     {% block topbar %}
     <header class="topbar">
-      <!-- Mobile hamburger -->
-      <button class="hamburger-btn" @click="mobileSidebarOpen = true; sidebarCollapsed = false;" title="Menu">
+      <!-- Hamburger / uncollapse sidebar -->
+      <button class="hamburger-btn" @click="sidebarCollapsed ? (sidebarCollapsed = false) : (mobileSidebarOpen = true; sidebarCollapsed = false)" title="Menu">
         <svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="3" y1="6" x2="21" y2="6"/><line x1="3" y1="12" x2="21" y2="12"/><line x1="3" y1="18" x2="21" y2="18"/></svg>
       </button>
       <div class="topbar-left">
diff --git a/app/templates/local_workspace.html b/app/templates/local_workspace.html
index 278e95f..6a7679e 100644
--- a/app/templates/local_workspace.html
+++ b/app/templates/local_workspace.html
@@ -4,7 +4,7 @@
 
 {% block topbar %}
 <header class="topbar">
-  <button class="hamburger-btn" @click="mobileSidebarOpen = true; sidebarCollapsed = false;" title="Menu">
+  <button class="hamburger-btn" @click="sidebarCollapsed ? (sidebarCollapsed = false) : (mobileSidebarOpen = true; sidebarCollapsed = false)" title="Menu">
     <svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="3" y1="6" x2="21" y2="6"/><line x1="3" y1="12" x2="21" y2="12"/><line x1="3" y1="18" x2="21" y2="18"/></svg>
   </button>
   <div class="topbar-left">
@@ -218,7 +218,7 @@
 .ws-table-compact tr:hover td{background:var(--bg-hover);}
 
 /* Split layout */
-.ws-split{display:flex;max-width:100%;margin:0 auto;padding:40px 24px 0;gap:0;min-height:calc(100vh - 44px);}
+.ws-split{display:flex;max-width:100%;margin:0 auto;padding:8px 16px 0;gap:0;min-height:calc(100vh - 44px);}
 .ws-main{flex:1;min-width:0;overflow:auto;padding-right:0;}
 .preview-panel + .ws-main{margin-right:0;}
 @media(max-width:768px){.ws-split{flex-direction:column;padding:20px 12px 0;}.preview-panel{width:100%;max-width:100%;min-width:100%;}.ws-main{width:100%;}}