diff --git a/apps/web/src/app/ui/content.tsx b/apps/web/src/app/content.tsx
similarity index 100%
rename from apps/web/src/app/ui/content.tsx
rename to apps/web/src/app/content.tsx
diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/page.tsx
index 221ce2b4..899a3f9a 100644
--- a/apps/web/src/app/page.tsx
+++ b/apps/web/src/app/page.tsx
@@ -1,4 +1,4 @@
-import { db } from '@/server/db';
+import { db } from "@/server/db";
 import {
   contentToSpace,
   sessions,
@@ -6,42 +6,37 @@ import {
   StoredContent,
   storedContent,
   users,
-} from '@/server/db/schema';
-import { eq, inArray } from 'drizzle-orm';
-import { cookies, headers } from 'next/headers';
-import { redirect } from 'next/navigation';
-import Sidebar from '@/components/Sidebar/index';
-import Main from '@/components/Main';
-import MessagePoster from './MessagePoster';
-import { transformContent } from '../../types/memory';
+} from "@/server/db/schema";
+import { eq, inArray } from "drizzle-orm";
+import { cookies, headers } from "next/headers";
+import { redirect } from "next/navigation";
+import Sidebar from "@/components/Sidebar/index";
+import Main from "@/components/Main";
+import MessagePoster from "./MessagePoster";
+import { transformContent } from "../../types/memory";
+import { MemoryProvider } from "@/contexts/MemoryContext";
+import Content from "./content";
 
-export const runtime = 'edge';
+export const runtime = "edge";
 
 export default async function Home() {
   const token =
-    cookies().get('next-auth.session-token')?.value ??
-    cookies().get('__Secure-authjs.session-token')?.value ??
-    cookies().get('authjs.session-token')?.value ??
-    headers().get('Authorization')?.replace('Bearer ', '');
+    cookies().get("next-auth.session-token")?.value ??
+    cookies().get("__Secure-authjs.session-token")?.value ??
+    cookies().get("authjs.session-token")?.value ??
+    headers().get("Authorization")?.replace("Bearer ", "");
 
   if (!token) {
-    return redirect('/api/auth/signin');
+    return redirect("/api/auth/signin");
   }
 
-  const selectedItem = cookies().get('selectedItem')?.value;
-
-  const setSelectedItem = async (selectedItem: string | null) => {
-    'use server';
-    cookies().set('selectedItem', selectedItem!);
-  };
-
   const session = await db
     .select()
     .from(sessions)
     .where(eq(sessions.sessionToken, token!));
 
   if (!session || session.length === 0) {
-    return redirect('/api/auth/signin');
+    return redirect("/api/auth/signin");
   }
 
   const [userData] = await db
@@ -51,7 +46,7 @@ export default async function Home() {
     .limit(1);
 
   if (!userData) {
-    return redirect('/api/auth/signin');
+    return redirect("/api/auth/signin");
   }
 
   // Fetch all content for the user
@@ -65,10 +60,8 @@ export default async function Home() {
     contents.length > 0 ? await transformContent(contents) : [];
 
   return (
-    <div className="flex w-screen">
-      <Sidebar selectChange={setSelectedItem} spaces={collectedSpaces} />
-      <Main sidebarOpen={selectedItem !== null} />
-      <MessagePoster jwt={token} />
-    </div>
+    <MemoryProvider spaces={collectedSpaces}>
+      <Content />
+    </MemoryProvider>
   );
 }
diff --git a/apps/web/src/app/ui/page.tsx b/apps/web/src/app/ui/page.tsx
index 35175334..6ff53738 100644
--- a/apps/web/src/app/ui/page.tsx
+++ b/apps/web/src/app/ui/page.tsx
@@ -1,10 +1,3 @@
-import { MemoryProvider } from "@/contexts/MemoryContext";
-import Content from "./content";
-
 export default function Home() {
-  return (
-    <MemoryProvider spaces={[]}>
-      <Content />
-    </MemoryProvider>
-  );
+  return <></>;
 }
diff --git a/apps/web/src/components/Sidebar/index.tsx b/apps/web/src/components/Sidebar/index.tsx
index 52bab0f9..8effffbd 100644
--- a/apps/web/src/components/Sidebar/index.tsx
+++ b/apps/web/src/components/Sidebar/index.tsx
@@ -28,19 +28,14 @@ const menuItemsBottom: Array<MenuItem> = [
 
 export default function Sidebar({
   selectChange,
-  spaces
 }: {
   selectChange?: (selectedItem: string | null) => void;
-  spaces: CollectedSpaces[];
 }) {
-  // TODO: @yxshv, put spaces in context here
-  // const { spaces } = useMemory();
-
   const menuItemsTop: Array<MenuItem> = [
     {
       icon: <MemoryIcon className="h-10 w-10" />,
       label: "Memories",
-      content: <MemoriesBar spaces={spaces} />,
+      content: <MemoriesBar />,
     },
   ];
   const menuItems = [...menuItemsTop, ...menuItemsBottom];
@@ -62,7 +57,7 @@ export default function Sidebar({
             item={{
               label: "Memories",
               icon: <MemoryIcon className="h-10 w-10" />,
-              content: <MemoriesBar spaces={spaces} />,
+              content: <MemoriesBar />,
             }}
             selectedItem={selectedItem}
             setSelectedItem={setSelectedItem}