diff --git a/src/renderer/layouts/auth-layout.tsx b/src/renderer/layouts/auth-layout.tsx
index 5b5fb258e..5ab4cb88b 100644
--- a/src/renderer/layouts/auth-layout.tsx
+++ b/src/renderer/layouts/auth-layout.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled';
 import { Outlet } from 'react-router-dom';
-import { Titlebar } from '../features/titlebar';
+import { Titlebar } from '@/renderer/features/titlebar/components/titlebar';
 
 const WindowsTitlebarContainer = styled.div`
   position: absolute;
diff --git a/src/renderer/layouts/default-layout.tsx b/src/renderer/layouts/default-layout.tsx
index 141075e98..5c1fe83a6 100644
--- a/src/renderer/layouts/default-layout.tsx
+++ b/src/renderer/layouts/default-layout.tsx
@@ -2,10 +2,11 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import styled from '@emotion/styled';
 import { Menu, Button } from '@mantine/core';
 import { Outlet } from 'react-router';
-import { Titlebar } from '@/renderer/features/titlebar';
+import { Titlebar } from '@/renderer/features/titlebar/components/titlebar';
+import { useAppStore } from '@/renderer/store';
 import { constrainSidebarWidth } from '@/renderer/utils';
 import { Playerbar } from '../features/player';
-import { Sidebar } from '../features/sidebar';
+import { Sidebar } from '../features/sidebar/components/sidebar';
 
 const Layout = styled.div`
   display: grid;
@@ -72,7 +73,8 @@ const ResizeHandle = styled.div<{
 `;
 
 export const DefaultLayout = () => {
-  const [leftSidebarWidth, setLeftSidebarWidth] = useState('170px');
+  const sidebar = useAppStore((state) => state.sidebar);
+  const setSidebar = useAppStore((state) => state.setSidebar);
 
   const sidebarRef = useRef(null);
   const [isResizing, setIsResizing] = useState(false);
@@ -88,12 +90,11 @@ export const DefaultLayout = () => {
   const resize = useCallback(
     (mouseMoveEvent) => {
       if (isResizing) {
-        setLeftSidebarWidth(
-          `${constrainSidebarWidth(mouseMoveEvent.clientX)}px`
-        );
+        const width = `${constrainSidebarWidth(mouseMoveEvent.clientX)}px`;
+        setSidebar({ leftWidth: width });
       }
     },
-    [isResizing]
+    [isResizing, setSidebar]
   );
 
   useEffect(() => {
@@ -107,47 +108,10 @@ export const DefaultLayout = () => {
 
   return (
     <>
-      {/* <LayoutContainer>
-        <TitlebarContainer size={30}>
-          <Titlebar />
-        </TitlebarContainer>
-        <Space.Fill>
-          <LeftSidebar
-            handleRender={(props) => (
-              <ResizeHandle placement="right" {...props} />
-            )}
-            maximumSize={400}
-            minimumSize={175}
-            size={175}
-          >
-            <Sidebar />
-          </LeftSidebar>
-          <RightSidebar
-            scrollable
-            handleRender={(props) => (
-              <ResizeHandle placement="left" {...props} />
-            )}
-            maximumSize={800}
-            size={300}
-          >
-            <QueueTable />
-          </RightSidebar>
-          <Space.Fill scrollable>
-            <AnimatePresence exitBeforeEnter>
-              <ContentContainer key={location.pathname}>
-                <Outlet />
-              </ContentContainer>
-            </AnimatePresence>
-          </Space.Fill>
-        </Space.Fill>
-        <PlayerbarContainer size={90}>
-          <Playerbar />
-        </PlayerbarContainer>
-      </LayoutContainer> */}
       <Layout>
         <TitlebarContainer>
           <Titlebar />
-          <Menu withinPortal zIndex="999999">
+          <Menu withinPortal>
             <Menu.Target>
               <Button />
             </Menu.Target>
@@ -157,7 +121,7 @@ export const DefaultLayout = () => {
             </Menu.Dropdown>
           </Menu>
         </TitlebarContainer>
-        <MainContainer leftSidebarWidth={leftSidebarWidth}>
+        <MainContainer leftSidebarWidth={sidebar.leftWidth}>
           <SidebarContainer>
             <ResizeHandle
               ref={sidebarRef}