diff --git a/src/app/(app)/problems/[id]/layout.tsx b/src/app/(app)/problems/[id]/layout.tsx
index 95f5f1c..63b418a 100644
--- a/src/app/(app)/problems/[id]/layout.tsx
+++ b/src/app/(app)/problems/[id]/layout.tsx
@@ -12,6 +12,7 @@ interface ProblemProps {
   Code: React.ReactNode;
   Testcase: React.ReactNode;
   TestResult: React.ReactNode;
+  Bot: React.ReactNode;
 }
 
 export default async function ProblemLayout({
@@ -22,21 +23,19 @@ export default async function ProblemLayout({
   Code,
   Testcase,
   TestResult,
+  Bot,
 }: ProblemProps) {
   const { id } = await params;
 
-  const [
-    problemData,
-    editorLanguageConfigs,
-    languageServerConfigs,
-  ] = await Promise.all([
-    prisma.problem.findUnique({
-      where: { id },
-      include: { templates: true },
-    }),
-    prisma.editorLanguageConfig.findMany(),
-    prisma.languageServerConfig.findMany(),
-  ]);
+  const [problemData, editorLanguageConfigs, languageServerConfigs] =
+    await Promise.all([
+      prisma.problem.findUnique({
+        where: { id },
+        include: { templates: true },
+      }),
+      prisma.editorLanguageConfig.findMany(),
+      prisma.languageServerConfig.findMany(),
+    ]);
 
   if (!problemData) {
     return notFound();
@@ -56,12 +55,71 @@ export default async function ProblemLayout({
         <PlaygroundHeader />
         <main className="flex flex-grow overflow-y-hidden p-2.5 pt-0">
           <DockView
-            Description={Description}
-            Solutions={Solutions}
-            Submissions={Submissions}
-            Code={Code}
-            Testcase={Testcase}
-            TestResult={TestResult}
+            storageKey="dockview:problem"
+            options={[
+              {
+                id: "Description",
+                title: "Description",
+                component: "Description",
+                tabComponent: "Description",
+                icon: "FileTextIcon",
+                node: Description,
+              },
+              {
+                id: "Solutions",
+                title: "Solutions",
+                component: "Solutions",
+                tabComponent: "Solutions",
+                icon: "FlaskConicalIcon",
+                node: Solutions,
+                position: { referencePanel: "Description", direction: "within" },
+              },
+              {
+                id: "Submissions",
+                title: "Submissions",
+                component: "Submissions",
+                tabComponent: "Submissions",
+                icon: "CircleCheckBigIcon",
+                node: Submissions,
+                position: { referencePanel: "Solutions", direction: "within" },
+              },
+              {
+                id: "Code",
+                title: "Code",
+                component: "Code",
+                tabComponent: "Code",
+                icon: "SquarePenIcon",
+                node: Code,
+                position: { referencePanel: "Submissions", direction: "right" },
+              },
+              {
+                id: "Bot",
+                title: "Bot",
+                component: "Bot",
+                tabComponent: "Bot",
+                icon: "BotIcon",
+                node: Bot,
+                position: { referencePanel: "Code", direction: "right" },
+              },
+              {
+                id: "Testcase",
+                title: "Testcase",
+                component: "Testcase",
+                tabComponent: "Testcase",
+                icon: "SquareCheckIcon",
+                node: Testcase,
+                position: { referencePanel: "Code", direction: "below" },
+              },
+              {
+                id: "TestResult",
+                title: "TestResult",
+                component: "TestResult",
+                tabComponent: "TestResult",
+                icon: "TerminalIcon",
+                node: TestResult,
+                position: { referencePanel: "Testcase", direction: "within" },
+              },
+            ]}
           />
         </main>
       </ProblemStoreProvider>