diff --git a/apps/desktop2/public/assets/dynamic.gif b/apps/desktop2/public/assets/dynamic.gif
new file mode 100644
index 000000000..9547b1074
Binary files /dev/null and b/apps/desktop2/public/assets/dynamic.gif differ
diff --git a/apps/desktop2/src/components/floating-chat-button.tsx b/apps/desktop2/src/components/floating-chat-button.tsx
new file mode 100644
index 000000000..f80f2d04e
--- /dev/null
+++ b/apps/desktop2/src/components/floating-chat-button.tsx
@@ -0,0 +1,72 @@
+import { Popover, PopoverContent, PopoverTrigger } from "@hypr/ui/components/ui/popover";
+import { cn } from "@hypr/ui/lib/utils";
+import { useState } from "react";
+
+export function FloatingChatButton() {
+  const [isOpen, setIsOpen] = useState(false);
+
+  return (
+    <Popover open={isOpen} onOpenChange={setIsOpen}>
+      <PopoverTrigger asChild>
+        <button
+          className={cn(
+            "fixed bottom-6 right-6 z-50",
+            "w-16 h-16 rounded-full",
+            "bg-white shadow-lg hover:shadow-xl",
+            "transition-all hover:scale-105",
+            "flex items-center justify-center",
+            "border border-neutral-200",
+            "overflow-hidden",
+          )}
+        >
+          <img
+            src="/assets/dynamic.gif"
+            alt="Chat Assistant"
+            className="w-12 h-12 object-contain"
+            onError={(e) => {
+              // Fallback to a text icon if image fails to load
+              const target = e.target as HTMLImageElement;
+              target.style.display = "none";
+              target.parentElement!.innerHTML = "💬";
+              target.parentElement!.classList.add("text-3xl");
+            }}
+          />
+        </button>
+      </PopoverTrigger>
+
+      <PopoverContent
+        className="w-96 h-[500px] mb-2 mr-2 p-0 overflow-hidden"
+        side="top"
+        align="end"
+        sideOffset={10}
+      >
+        <div className="h-full flex flex-col bg-white">
+          <div className="p-4 border-b border-neutral-200 flex items-center justify-between">
+            <h3 className="font-semibold text-lg">Chat Assistant</h3>
+            <button
+              onClick={() => setIsOpen(false)}
+              className="text-neutral-400 hover:text-neutral-600 text-xl"
+            >
+              ×
+            </button>
+          </div>
+
+          <div className="flex-1 p-4 overflow-y-auto">
+            <div className="text-center text-neutral-400 mt-20">
+              Chat interface will appear here
+            </div>
+          </div>
+
+          <div className="p-4 border-t border-neutral-200">
+            <input
+              type="text"
+              placeholder="Type a message..."
+              className="w-full px-3 py-2 border border-neutral-200 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"
+              disabled
+            />
+          </div>
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/apps/desktop2/src/components/main/main-area.tsx b/apps/desktop2/src/components/main/main-area.tsx
index f7c6ea439..05f59b6be 100644
--- a/apps/desktop2/src/components/main/main-area.tsx
+++ b/apps/desktop2/src/components/main/main-area.tsx
@@ -1,11 +1,10 @@
 import { useRouteContext } from "@tanstack/react-router";
 import { clsx } from "clsx";
-import { addMonths, eachDayOfInterval, endOfMonth, format, getDay, startOfMonth } from "date-fns";
+import { addMonths, eachDayOfInterval, endOfMonth, format, getDay, isSameMonth, startOfMonth } from "date-fns";
 import {
   CalendarIcon,
-  ChevronLeftIcon,
-  ChevronRightIcon,
   CogIcon,
+  FileTextIcon,
   FolderIcon,
   PanelLeftOpenIcon,
   PencilIcon,
@@ -16,10 +15,10 @@ import { useCallback } from "react";
 
 import { commands as windowsCommands } from "@hypr/plugin-windows";
 import NoteEditor from "@hypr/tiptap/editor";
-import { ChatPanelButton } from "@hypr/ui/components/block/chat-panel-button";
+import { CalendarStructure } from "@hypr/ui/components/block/calendar-structure";
+import { TabHeader } from "@hypr/ui/components/block/tab-header";
 import TitleInput from "@hypr/ui/components/block/title-input";
-import { Button } from "@hypr/ui/components/ui/button";
-import { useLeftSidebar, useRightPanel } from "@hypr/utils/contexts";
+import { useLeftSidebar } from "@hypr/utils/contexts";
 import * as persisted from "../../store/tinybase/persisted";
 import { useTabs } from "../../store/zustand/tabs";
 import { rowIdfromTab, type Tab, uniqueIdfromTab } from "../../store/zustand/tabs";
@@ -41,7 +40,6 @@ export function MainContent() {
 
 export function MainHeader() {
   const { persistedStore, internalStore } = useRouteContext({ from: "__root__" });
-  const { isExpanded: isRightPanelExpanded, togglePanel: toggleRightPanel } = useRightPanel();
   const { isExpanded: isLeftPanelExpanded, togglePanel: toggleLeftPanel } = useLeftSidebar();
   const { openNew } = useTabs();
 
@@ -104,11 +102,6 @@ export function MainHeader() {
           className="cursor-pointer h-5 w-5 text-muted-foreground hover:text-foreground"
         />
       </div>
-
-      <ChatPanelButton
-        isExpanded={isRightPanelExpanded}
-        togglePanel={toggleRightPanel}
-      />
     </header>
   );
 }
@@ -341,6 +334,15 @@ function TabContentNote({ tab }: { tab: Tab }) {
         value={sessionRow.title ?? ""}
         onChange={(e) => handleEditTitle(e.target.value)}
       />
+      <TabHeader
+        isEnhancing={false}
+        onVisibilityChange={() => {}}
+        currentTab="raw"
+        onTabChange={() => {}}
+        isCurrentlyRecording={false}
+        shouldShowTab={true}
+        shouldShowEnhancedTab={false}
+      />
       <NoteEditor
         initialContent={sessionRow.raw_md ?? ""}
         handleChange={(e) => handleEditRawMd(e)}
@@ -427,7 +429,7 @@ function TabContentCalendar({ tab }: { tab: Tab }) {
   const monthStart = startOfMonth(tab.month);
   const monthEnd = endOfMonth(tab.month);
   const days = eachDayOfInterval({ start: monthStart, end: monthEnd }).map((day) => format(day, "yyyy-MM-dd"));
-  const startDayOfWeek = getDay(monthStart); // 0 = Sunday, 6 = Saturday
+  const startDayOfWeek = getDay(monthStart);
   const weekDays = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
 
   const handlePreviousMonth = () => {
@@ -443,85 +445,103 @@ function TabContentCalendar({ tab }: { tab: Tab }) {
   };
 
   return (
-    <div className="flex flex-col h-full p-4">
-      <div className="mb-4 flex items-center justify-between">
-        <div className="text-xl font-semibold">
-          {format(tab.month, "MMMM yyyy")}
-        </div>
-        <div className="flex h-fit rounded-md overflow-clip border border-neutral-200">
-          <Button
-            variant="outline"
-            className="p-0.5 rounded-none border-none"
-            onClick={handlePreviousMonth}
-          >
-            <ChevronLeftIcon size={16} />
-          </Button>
-
-          <Button
-            variant="outline"
-            className="text-sm px-1 py-0.5 rounded-none border-none"
-            onClick={handleToday}
-          >
-            Today
-          </Button>
-
-          <Button
-            variant="outline"
-            className="p-0.5 rounded-none border-none"
-            onClick={handleNextMonth}
-          >
-            <ChevronRightIcon size={16} />
-          </Button>
-        </div>
-      </div>
-      <div className="grid grid-cols-7 gap-2">
-        {weekDays.map((day) => (
-          <div key={day} className="text-center text-sm font-medium text-muted-foreground p-2">
-            {day}
-          </div>
-        ))}
-        {Array.from({ length: startDayOfWeek }).map((_, i) => <div key={`empty-${i}`} />)}
-        {days.map((day) => <TabContentCalendarDay key={day} day={day} />)}
-      </div>
-    </div>
+    <CalendarStructure
+      monthLabel={format(tab.month, "MMMM yyyy")}
+      weekDays={weekDays}
+      startDayOfWeek={startDayOfWeek}
+      onPreviousMonth={handlePreviousMonth}
+      onNextMonth={handleNextMonth}
+      onToday={handleToday}
+    >
+      {days.map((day) => (
+        <TabContentCalendarDay key={day} day={day} isCurrentMonth={isSameMonth(new Date(day), tab.month)} />
+      ))}
+    </CalendarStructure>
   );
 }
 
-function TabContentCalendarDay({ day }: { day: string }) {
+function TabContentCalendarDay({ day, isCurrentMonth }: { day: string; isCurrentMonth: boolean }) {
   const eventIds = persisted.UI.useSliceRowIds(
     persisted.INDEXES.eventsByDate,
     day,
     persisted.STORE_ID,
   );
 
+  const sessionIds = persisted.UI.useSliceRowIds(
+    persisted.INDEXES.sessionByDateWithoutEvent,
+    day,
+    persisted.STORE_ID,
+  );
+
   const dayNumber = format(new Date(day), "d");
   const isToday = format(new Date(), "yyyy-MM-dd") === day;
+  const dayOfWeek = getDay(new Date(day));
+  const isWeekend = dayOfWeek === 0 || dayOfWeek === 6;
 
   return (
     <div
       className={clsx([
-        "h-32 max-h-32 p-2 border rounded-md flex flex-col overflow-hidden",
-        isToday ? "bg-blue-50 border-blue-300" : "bg-background border-border",
+        "h-32 relative flex flex-col border-b border-neutral-200",
+        isWeekend ? "bg-neutral-50" : "bg-white",
       ])}
     >
-      <div
-        className={clsx([
-          "text-sm font-medium mb-1 flex-shrink-0",
-          isToday && "text-blue-600",
-        ])}
-      >
-        {dayNumber}
+      <div className="flex items-center justify-end px-1 text-sm h-8">
+        <div className={clsx("flex items-end gap-1", isToday && "items-center")}>
+          <div
+            className={clsx(
+              isToday && "bg-red-500 rounded-full w-6 h-6 flex items-center justify-center",
+            )}
+          >
+            <span
+              className={clsx(
+                isToday
+                  ? "text-white font-medium"
+                  : !isCurrentMonth
+                  ? "text-neutral-400"
+                  : isWeekend
+                  ? "text-neutral-500"
+                  : "text-neutral-700",
+              )}
+            >
+              {dayNumber}
+            </span>
+          </div>
+        </div>
+      </div>
+
+      <div className="flex-1 overflow-hidden flex flex-col px-1">
+        <div className="space-y-1">
+          {eventIds.map((eventId) => <TabContentCalendarDayEvents key={eventId} eventId={eventId} />)}
+          {sessionIds.map((sessionId) => <TabContentCalendarDaySessions key={sessionId} sessionId={sessionId} />)}
+        </div>
       </div>
-      <div className="flex flex-col gap-1 overflow-y-auto">
-        {eventIds?.map((rowId) => <TabContentCalendarDayEvent key={rowId} rowId={rowId} />)}
+    </div>
+  );
+}
+
+function TabContentCalendarDayEvents({ eventId }: { eventId: string }) {
+  const event = persisted.UI.useRow("events", eventId, persisted.STORE_ID);
+
+  return (
+    <div className="flex items-center space-x-1 px-0.5 py-0.5 cursor-pointer rounded hover:bg-neutral-200 transition-colors h-5">
+      <CalendarIcon className="w-2.5 h-2.5 text-neutral-500 flex-shrink-0" />
+      <div className="flex-1 text-xs text-neutral-800 truncate">
+        {event.title}
       </div>
     </div>
   );
 }
 
-function TabContentCalendarDayEvent({ rowId }: { rowId: string }) {
-  const event = persisted.UI.useRow("events", rowId, persisted.STORE_ID);
-  return <div className="text-xs bg-blue-100 px-1.5 py-0.5 rounded truncate">{event.title}</div>;
+function TabContentCalendarDaySessions({ sessionId }: { sessionId: string }) {
+  const session = persisted.UI.useRow("sessions", sessionId, persisted.STORE_ID);
+  return (
+    <div className="flex items-center space-x-1 px-0.5 py-0.5 cursor-pointer rounded hover:bg-neutral-200 transition-colors h-5">
+      <FileTextIcon className="w-2.5 h-2.5 text-neutral-500 flex-shrink-0" />
+      <div className="flex-1 text-xs text-neutral-800 truncate">
+        {session.title}
+      </div>
+    </div>
+  );
 }
 
 function TabContentFolder({ tab }: { tab: Tab }) {
diff --git a/apps/desktop2/src/routes/app/main/_layout.index.tsx b/apps/desktop2/src/routes/app/main/_layout.index.tsx
index 9ac5067f8..cb026cfb3 100644
--- a/apps/desktop2/src/routes/app/main/_layout.index.tsx
+++ b/apps/desktop2/src/routes/app/main/_layout.index.tsx
@@ -1,8 +1,8 @@
 import { createFileRoute } from "@tanstack/react-router";
 
 import { ResizableHandle, ResizablePanel, ResizablePanelGroup } from "@hypr/ui/components/ui/resizable";
-import { useLeftSidebar, useRightPanel } from "@hypr/utils/contexts";
-import { Chat } from "../../../components/chat";
+import { useLeftSidebar } from "@hypr/utils/contexts";
+import { FloatingChatButton } from "../../../components/floating-chat-button";
 import { LeftSidebar } from "../../../components/main/left-sidebar";
 import { MainContent, MainHeader } from "../../../components/main/main-area";
 
@@ -11,7 +11,6 @@ export const Route = createFileRoute("/app/main/_layout/")({
 });
 
 function Component() {
-  const { isExpanded: isRightPanelExpanded } = useRightPanel();
   const { isExpanded: isLeftPanelExpanded } = useLeftSidebar();
 
   return (
@@ -27,21 +26,10 @@ function Component() {
       <ResizablePanel>
         <div className="flex flex-col h-full">
           <MainHeader />
-          {isRightPanelExpanded
-            ? (
-              <ResizablePanelGroup direction="horizontal">
-                <ResizablePanel defaultSize={60} minSize={30}>
-                  <MainContent />
-                </ResizablePanel>
-                <ResizableHandle withHandle />
-                <ResizablePanel defaultSize={40} minSize={30}>
-                  <Chat />
-                </ResizablePanel>
-              </ResizablePanelGroup>
-            )
-            : <MainContent />}
+          <MainContent />
         </div>
       </ResizablePanel>
+      <FloatingChatButton />
     </ResizablePanelGroup>
   );
 }
diff --git a/apps/desktop2/src/store/tinybase/persisted.ts b/apps/desktop2/src/store/tinybase/persisted.ts
index e762fb30b..255d56d6c 100644
--- a/apps/desktop2/src/store/tinybase/persisted.ts
+++ b/apps/desktop2/src/store/tinybase/persisted.ts
@@ -371,6 +371,21 @@ export const StoreComponent = () => {
         (a, b) => a.localeCompare(b),
         (a, b) => String(a).localeCompare(String(b)),
       )
+      .setIndexDefinition(
+        INDEXES.sessionByDateWithoutEvent,
+        "sessions",
+        (getCell) => {
+          if (getCell("event_id")) {
+            return "";
+          }
+
+          const d = new Date(getCell("created_at")!);
+          return format(d, "yyyy-MM-dd");
+        },
+        "created_at",
+        (a, b) => a.localeCompare(b),
+        (a, b) => String(a).localeCompare(String(b)),
+      )
       .setIndexDefinition(INDEXES.tagsByName, "tags", "name")
       .setIndexDefinition(INDEXES.tagSessionsBySession, "mapping_tag_session", "session_id")
       .setIndexDefinition(INDEXES.tagSessionsByTag, "mapping_tag_session", "tag_id")
@@ -412,6 +427,7 @@ export const INDEXES = {
   sessionsByFolder: "sessionsByFolder",
   eventsByCalendar: "eventsByCalendar",
   eventsByDate: "eventsByDate",
+  sessionByDateWithoutEvent: "sessionByDateWithoutEvent",
   tagsByName: "tagsByName",
   tagSessionsBySession: "tagSessionsBySession",
   tagSessionsByTag: "tagSessionsByTag",
diff --git a/packages/ui/src/components/block/calendar-structure.tsx b/packages/ui/src/components/block/calendar-structure.tsx
new file mode 100644
index 000000000..7db80fc81
--- /dev/null
+++ b/packages/ui/src/components/block/calendar-structure.tsx
@@ -0,0 +1,71 @@
+import { ChevronLeftIcon, ChevronRightIcon } from "lucide-react";
+import { Button } from "../ui/button";
+
+interface CalendarStructureProps {
+  monthLabel: string;
+  weekDays: string[];
+  startDayOfWeek: number;
+  onPreviousMonth: () => void;
+  onNextMonth: () => void;
+  onToday: () => void;
+  children: React.ReactNode;
+}
+
+export const CalendarStructure = ({
+  monthLabel,
+  weekDays,
+  startDayOfWeek,
+  onPreviousMonth,
+  onNextMonth,
+  onToday,
+  children,
+}: CalendarStructureProps) => {
+  return (
+    <div className="flex flex-col h-full p-4">
+      <div className="mb-4 flex items-center relative">
+        <div className="text-xl font-semibold absolute left-1/2 transform -translate-x-1/2">{monthLabel}</div>
+        <div className="flex h-fit rounded-md overflow-clip border border-neutral-200 ml-auto">
+          <Button
+            variant="outline"
+            className="p-0.5 rounded-none border-none"
+            onClick={onPreviousMonth}
+          >
+            <ChevronLeftIcon size={16} />
+          </Button>
+
+          <Button
+            variant="outline"
+            className="text-sm px-1 py-0.5 rounded-none border-none"
+            onClick={onToday}
+          >
+            Today
+          </Button>
+
+          <Button
+            variant="outline"
+            className="p-0.5 rounded-none border-none"
+            onClick={onNextMonth}
+          >
+            <ChevronRightIcon size={16} />
+          </Button>
+        </div>
+      </div>
+      <div className="grid grid-cols-7 divide-x divide-neutral-200">
+        {weekDays.map((day) => (
+          <div
+            key={day}
+            className="text-center text-sm font-medium text-muted-foreground p-2"
+          >
+            {day}
+          </div>
+        ))}
+      </div>
+      <div className="grid grid-cols-7 divide-x divide-neutral-200 h-full grid-rows-6 gap-0">
+        {Array.from({ length: startDayOfWeek }).map((_, i) => (
+          <div key={`empty-${i}`} className="border-b border-neutral-200" />
+        ))}
+        {children}
+      </div>
+    </div>
+  );
+};