diff --git a/src/components/AITutor/AITutorSidebar.tsx b/src/components/AITutor/AITutorSidebar.tsx
new file mode 100644
index 000000000..2ef0ca0c8
--- /dev/null
+++ b/src/components/AITutor/AITutorSidebar.tsx
@@ -0,0 +1,66 @@
+import { ChevronLeft, PlusCircle, BookOpen, Compass } from 'lucide-react';
+
+type AITutorSidebarProps = {
+  activeTab: 'new' | 'courses' | 'explore';
+};
+
+const sidebarItems = [
+  {
+    key: 'new',
+    label: 'New Course',
+    href: '/ai/new',
+    icon: PlusCircle,
+  },
+  {
+    key: 'courses',
+    label: 'My Courses',
+    href: '/ai/courses',
+    icon: BookOpen,
+  },
+  {
+    key: 'explore',
+    label: 'Explore',
+    href: '/ai/explore',
+    icon: Compass,
+  },
+];
+
+export function AITutorSidebar(props: AITutorSidebarProps) {
+  const { activeTab } = props;
+
+  return (
+    <div className="flex w-[240px] flex-col border-r border-gray-200 bg-gradient-to-b from-white to-gray-50">
+      <a
+        href="https://roadmap.sh"
+        className="flex w-full items-center justify-start gap-1.5 border-b border-gray-200 px-5 py-2 text-sm text-gray-600 transition-colors hover:bg-gray-100 hover:text-black"
+      >
+        <ChevronLeft className="size-4" />
+        Back to <span className="font-semibold text-black">roadmap.sh</span>
+      </a>
+
+      <div className="px-6 pt-6 pb-2">
+        <h2 className="text-lg font-semibold text-gray-900">Learn with AI</h2>
+        <p className="mt-1 text-sm text-gray-500">
+          Your personalized learning companion for any topic
+        </p>
+      </div>
+
+      <div className="flex-1 px-3 py-3">
+        <nav className="space-y-1">
+          {sidebarItems.map((item) => (
+            <a
+              key={item.key}
+              href={item.href}
+              className={`flex w-full items-center gap-3 rounded-lg px-3 py-2.5 text-sm font-medium text-gray-700 transition-all hover:bg-gray-100 hover:text-black ${
+                activeTab === item.key ? 'bg-gray-100 text-black' : ''
+              }`}
+            >
+              <item.icon className="size-4" />
+              {item.label}
+            </a>
+          ))}
+        </nav>
+      </div>
+    </div>
+  );
+}
diff --git a/src/components/GenerateCourse/FineTuneCourse.tsx b/src/components/GenerateCourse/FineTuneCourse.tsx
index 44d967b0f..e1641ca59 100644
--- a/src/components/GenerateCourse/FineTuneCourse.tsx
+++ b/src/components/GenerateCourse/FineTuneCourse.tsx
@@ -1,4 +1,3 @@
-import { useState } from 'react';
 import { cn } from '../../lib/classname';
 
 type QuestionProps = {
@@ -70,7 +69,7 @@ export function FineTuneCourse(props: FineTuneCourseProps) {
           }}
         />
         Tell us more to tailor the course (optional){' '}
-        <span className="ml-auto rounded-md bg-gray-400 px-2 py-0.5 text-xs text-white">
+        <span className="ml-auto rounded-md bg-gray-400 px-2 py-0.5 text-xs text-white hidden sm:block">
           recommended
         </span>
       </label>
diff --git a/src/pages/ai/index.astro b/src/pages/ai/index.astro
index 3a67adf52..c0e6a1f6f 100644
--- a/src/pages/ai/index.astro
+++ b/src/pages/ai/index.astro
@@ -1,18 +1,23 @@
 ---
-import { AICourse } from '../../components/GenerateCourse/AICourse';
-import BaseLayout from '../../layouts/BaseLayout.astro';
+import { ChevronLeft, PlusCircle, BookOpen, Compass } from 'lucide-react';
 import { CheckSubscriptionVerification } from '../../components/Billing/CheckSubscriptionVerification';
-
+import { AICourse } from '../../components/GenerateCourse/AICourse';
+import SkeletonLayout from '../../layouts/SkeletonLayout.astro';
+import { AITutorSidebar } from '../../components/AITutor/AITutorSidebar';
 const ogImage = 'https://roadmap.sh/og-images/ai-tutor.png';
 ---
 
-<BaseLayout
+<SkeletonLayout
   title='Roadmap AI'
   noIndex={true}
   ogImageUrl={ogImage}
   description='Learn anything with AI Tutor. Pick a topic, choose a difficulty level and the AI will guide you through the learning process.'
 >
-  <div slot='course-announcement'></div>
-  <AICourse client:load />
-  <CheckSubscriptionVerification client:load />
-</BaseLayout>
+  <div class='flex flex-grow flex-row'>
+    <AITutorSidebar client:load activeTab='new' />
+    <div class='flex flex-grow flex-col'>
+      <AICourse client:load />
+      <CheckSubscriptionVerification client:load />
+    </div>
+  </div>
+</SkeletonLayout>