diff --git a/.Jules/palette.md b/.Jules/palette.md
new file mode 100644
index 00000000..c39e195b
--- /dev/null
+++ b/.Jules/palette.md
@@ -0,0 +1,4 @@
+## 2024-03-24 - Tooltips with complex Radix UI nested triggers
+
+**Learning:** Combining multiple Radix UI triggers (like TooltipTrigger, DropdownMenuTrigger) requires careful use of `asChild` and correct nesting. Specifically, nesting `<TooltipTrigger asChild>` around `<DropdownMenuTrigger asChild>` which wraps the actual `<Button>` ensures that event delegation and accessibility attributes are correctly combined and forwarded to the final DOM element.
+**Action:** When adding tooltips to buttons that already act as triggers for dropdowns or dialogs, always ensure `asChild` is applied at each intermediate trigger layer down to the final interactive element.
diff --git a/.github/workflows/model-quality.yml b/.github/workflows/model-quality.yml
index d5650ca3..a4caa437 100644
--- a/.github/workflows/model-quality.yml
+++ b/.github/workflows/model-quality.yml
@@ -17,6 +17,8 @@ jobs:
       REAL_DATA_MIN_DAYS: 7
       LEARNED_KFOLDS: 5
       LEARNED_MAX_VAL_LOSS: 0.2
+      FORECAST_BACKTEST_STALE_DAYS: 7
+      FORECAST_BACKTEST_SOURCE: mock
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3791510b..2a2fe9dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 #### 📄 Enhanced PDF Export
+
 - Professional PDF reports with executive summary and key metrics
 - Department health breakdown with visual indicators
 - Risk analysis section with color-coded badges
@@ -30,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - ROI metrics (hours saved, cost savings, escalations prevented)
 
 #### 📅 Custom Date Range Picker
+
 - Interactive calendar-based date selection
 - Quick presets (7, 30, 60, 90 days)
 - Smooth animations with Framer Motion
@@ -37,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Persistent date range state
 
 #### 💬 Collaborative Event Annotations
+
 - Team comments on events with threaded replies
 - @mention support for teammates
 - Emoji reactions (👍, 👎, ❤️, 🎉, 🤔, 👀, 🔥, 💯)
@@ -45,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Dedicated API endpoints with authentication
 
 #### ⚡ WebSocket Live Updates
+
 - Real-time health score updates
 - Live event notifications
 - Metric change streaming
@@ -54,6 +58,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Simulated updates for development mode
 
 #### 👤 User Preference Profiles
+
 - Comprehensive preferences modal with 4 tabs (Display, Notifications, Filters, Dashboard)
 - Theme selection (Light, Dark, System)
 - Display density options (Comfortable, Compact)
@@ -79,7 +84,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Enhanced DateRangePicker component in filters/
 - Event annotation types in repository interface
 
-
 ## [0.1.0] - 2025-01-XX
 
 ### Added
diff --git a/FEATURES_GUIDE.md b/FEATURES_GUIDE.md
index abfbab07..60ec7f3c 100644
--- a/FEATURES_GUIDE.md
+++ b/FEATURES_GUIDE.md
@@ -289,6 +289,7 @@ Tested on:
 Professional PDF reports with executive summary, department breakdown, and AI insights.
 
 **Features:**
+
 - Executive summary with health score and key metrics
 - Department health breakdown with color-coded status badges
 - Event timeline with severity indicators
@@ -299,7 +300,7 @@ Professional PDF reports with executive summary, department breakdown, and AI in
 
 ```tsx
 // Use the ExportButton component (already integrated)
-<ExportButton variant="compact" />
+;<ExportButton variant="compact" />
 
 // Or generate programmatically:
 import { generateEnhancedPdf } from '@/lib/reports/pdfGenerator'
@@ -319,6 +320,7 @@ const pdfBuffer = await generateEnhancedPdf({
 Interactive calendar-based date selection with presets.
 
 **Features:**
+
 - Full calendar view with month navigation
 - Quick presets: 7, 30, 60, 90 days
 - Visual range highlighting
@@ -329,8 +331,7 @@ Interactive calendar-based date selection with presets.
 
 ```tsx
 import DateRangePicker from '@/components/filters/DateRangePicker'
-
-<DateRangePicker
+;<DateRangePicker
   startDate={new Date(filters.dateRange.start)}
   endDate={new Date(filters.dateRange.end)}
   onChange={({ start, end }) => {
@@ -347,6 +348,7 @@ import DateRangePicker from '@/components/filters/DateRangePicker'
 Team comments on events with replies and reactions.
 
 **Features:**
+
 - Threaded comment replies
 - @mention support for teammates
 - Emoji reactions (👍, 👎, ❤️, 🎉, 🤔, etc.)
@@ -360,13 +362,8 @@ import EventAnnotations from '@/components/events/EventAnnotations'
 import { useEventAnnotations } from '@/hooks/useEventAnnotations'
 
 function EventDetail({ eventId }) {
-  const {
-    annotations,
-    addAnnotation,
-    editAnnotation,
-    deleteAnnotation,
-    react,
-  } = useEventAnnotations({ eventId })
+  const { annotations, addAnnotation, editAnnotation, deleteAnnotation, react } =
+    useEventAnnotations({ eventId })
 
   return (
     <EventAnnotations
@@ -390,6 +387,7 @@ function EventDetail({ eventId }) {
 Real-time data streaming with connection management.
 
 **Features:**
+
 - Health score live updates
 - New event notifications
 - Metric change streaming
@@ -436,6 +434,7 @@ function DevDashboard() {
 Comprehensive user settings with persistence and sync.
 
 **Features:**
+
 - Theme selection (Light, Dark, System)
 - Display density options
 - Notification channel controls (Email, Push, Slack)
@@ -452,24 +451,19 @@ Comprehensive user settings with persistence and sync.
 import { UserPreferencesProvider } from '@/hooks/useUserPreferences'
 
 function AppLayout({ children }) {
-  return (
-    <UserPreferencesProvider userId={user?.id}>
-      {children}
-    </UserPreferencesProvider>
-  )
+  return <UserPreferencesProvider userId={user?.id}>{children}</UserPreferencesProvider>
 }
 
 // Use the preferences button
 import PreferencesButton from '@/components/settings/PreferencesButton'
-
-<PreferencesButton variant="icon" />
+;<PreferencesButton variant="icon" />
 
 // Access preferences in components
 import { useUserPreferences, useAutoRefresh } from '@/hooks/useUserPreferences'
 
 function Dashboard() {
   const { preferences, updatePreferences } = useUserPreferences()
-  
+
   // Auto-refresh based on user preference
   useAutoRefresh(() => refreshData())
 
@@ -615,4 +609,3 @@ interface ThemeToggleProps {
 ---
 
 **Built with ❤️ for FluxLens AI v1.0.2**
-
diff --git a/POLISH_FIXES_SUMMARY.md b/POLISH_FIXES_SUMMARY.md
index 1089abb4..b5e7bb65 100644
--- a/POLISH_FIXES_SUMMARY.md
+++ b/POLISH_FIXES_SUMMARY.md
@@ -49,6 +49,7 @@
 **Status**: ✅ Complete
 **Current**: AppHeader conditionally shows Dashboard/Reports/Settings when logged in
 **Verified**:
+
 - Marketing nav (Product, AI Copilot, Forecast Timeline) shows when logged out
 - App nav (Dashboard, Reports, Settings) only shows when logged in
 
@@ -57,6 +58,7 @@
 **Status**: ✅ Complete (v1.0.2)
 **Updated**: `src/components/signals/SlackSignalPanel.tsx`
 **Improvements**:
+
 - User avatars with status indicators (active/idle/resolved)
 - Department-based color coding with hash fallback
 - Activity heat indicators (3-bar visual)
@@ -71,6 +73,7 @@
 **Status**: ✅ Complete (v1.0.2)
 **Updated**: `src/components/analytics/RiskWeightedTimeline.tsx`
 **Improvements**:
+
 - Lane toggle filter buttons (Handoff, Latency, Meeting, Engagement)
 - Annotated severity markers with color-coded labels
 - Keyboard navigation (Arrow keys, Enter to expand, Escape to close)
@@ -85,6 +88,7 @@
 **Status**: ✅ Complete (v1.0.2)
 **Created**: `src/components/ui/skeleton.tsx`
 **Improvements**:
+
 - Comprehensive skeleton loader system:
   - Base `Skeleton` component with pulse/wave animations
   - `SkeletonText` - Multi-line text placeholder
@@ -105,6 +109,7 @@
 **Status**: ✅ Complete
 **Current**: API falls back to repo.listEvents
 **Verified**:
+
 - Fallback works in local dev with demo channels
 - SlackSignalPanel shows helpful message when no live data
 - Skeleton loading states prevent empty flash
@@ -113,18 +118,18 @@
 
 All 10 polish items have been addressed:
 
-| # | Item | Status |
-|---|------|--------|
-| 1 | Hero Media - Real Preview | ✅ Complete |
-| 2 | Layout Consistency | ✅ Complete |
-| 3 | Metric Formatting | ✅ Complete |
-| 4 | Reports/Settings Navigation | ✅ Complete |
-| 5 | Feature Pod Previews | ✅ Documented |
-| 6 | Navigation Separation | ✅ Verified |
-| 7 | Slack Signals Enhancement | ✅ Complete (v1.0.2) |
-| 8 | AI Analyst & Forecast Features | ✅ Complete (v1.0.2) |
-| 9 | Motion/Accessibility Specs | ✅ Complete (v1.0.2) |
-| 10 | Data Fallback for Slack | ✅ Verified |
+| #   | Item                           | Status               |
+| --- | ------------------------------ | -------------------- |
+| 1   | Hero Media - Real Preview      | ✅ Complete          |
+| 2   | Layout Consistency             | ✅ Complete          |
+| 3   | Metric Formatting              | ✅ Complete          |
+| 4   | Reports/Settings Navigation    | ✅ Complete          |
+| 5   | Feature Pod Previews           | ✅ Documented        |
+| 6   | Navigation Separation          | ✅ Verified          |
+| 7   | Slack Signals Enhancement      | ✅ Complete (v1.0.2) |
+| 8   | AI Analyst & Forecast Features | ✅ Complete (v1.0.2) |
+| 9   | Motion/Accessibility Specs     | ✅ Complete (v1.0.2) |
+| 10  | Data Fallback for Slack        | ✅ Verified          |
 
 ## Notes
 
diff --git a/scripts/screenshot.ts b/scripts/screenshot.ts
index f886bb5d..79c5b3a4 100644
--- a/scripts/screenshot.ts
+++ b/scripts/screenshot.ts
@@ -1,30 +1,29 @@
-import { chromium } from '@playwright/test';
+import { chromium } from '@playwright/test'
 
 async function capture() {
-    const browser = await chromium.launch();
-    const page = await browser.newPage();
+  const browser = await chromium.launch()
+  const page = await browser.newPage()
 
-    // Set a nice desktop viewport
-    await page.setViewportSize({ width: 1440, height: 900 });
+  // Set a nice desktop viewport
+  await page.setViewportSize({ width: 1440, height: 900 })
 
-    try {
-        console.log('Navigating to landing page...');
-        await page.goto('http://127.0.0.1:3000', { waitUntil: 'networkidle' });
+  try {
+    console.log('Navigating to landing page...')
+    await page.goto('http://127.0.0.1:3000', { waitUntil: 'networkidle' })
 
-        // Evaluate to hide scrollbars for a cleaner shot (optional but nice)
-        await page.evaluate(() => {
-            document.body.style.overflow = 'hidden';
-        });
+    // Evaluate to hide scrollbars for a cleaner shot (optional but nice)
+    await page.evaluate(() => {
+      document.body.style.overflow = 'hidden'
+    })
 
-        console.log('Taking screenshot...');
-        await page.screenshot({ path: 'landing_page.png', fullPage: false });
-        console.log('Screenshot saved to landing_page.png');
-
-    } catch (error) {
-        console.error('Error capturing screenshot:', error);
-    } finally {
-        await browser.close();
-    }
+    console.log('Taking screenshot...')
+    await page.screenshot({ path: 'landing_page.png', fullPage: false })
+    console.log('Screenshot saved to landing_page.png')
+  } catch (error) {
+    console.error('Error capturing screenshot:', error)
+  } finally {
+    await browser.close()
+  }
 }
 
-capture();
+capture()
diff --git a/scripts/screenshot_dark.ts b/scripts/screenshot_dark.ts
index 93a38093..45c35cdd 100644
--- a/scripts/screenshot_dark.ts
+++ b/scripts/screenshot_dark.ts
@@ -1,35 +1,34 @@
-import { chromium } from '@playwright/test';
+import { chromium } from '@playwright/test'
 
 async function capture() {
-    const browser = await chromium.launch();
-    const page = await browser.newPage();
-
-    // Set a nice desktop viewport
-    await page.setViewportSize({ width: 1440, height: 900 });
-
-    // Force dark mode preference
-    await page.emulateMedia({ colorScheme: 'dark' });
-
-    try {
-        console.log('Navigating to landing page (dark mode)...');
-        await page.goto('http://127.0.0.1:3000', { waitUntil: 'networkidle' });
-
-        // Evaluate to hide scrollbars for a cleaner shot
-        await page.evaluate(() => {
-            document.body.style.overflow = 'hidden';
-            // Also try to force a class if the theme is class-based (common in Tailwind)
-            document.documentElement.classList.add('dark');
-        });
-
-        console.log('Taking screenshot...');
-        await page.screenshot({ path: 'landing_page_dark.png', fullPage: false });
-        console.log('Screenshot saved to landing_page_dark.png');
-
-    } catch (error) {
-        console.error('Error capturing screenshot:', error);
-    } finally {
-        await browser.close();
-    }
+  const browser = await chromium.launch()
+  const page = await browser.newPage()
+
+  // Set a nice desktop viewport
+  await page.setViewportSize({ width: 1440, height: 900 })
+
+  // Force dark mode preference
+  await page.emulateMedia({ colorScheme: 'dark' })
+
+  try {
+    console.log('Navigating to landing page (dark mode)...')
+    await page.goto('http://127.0.0.1:3000', { waitUntil: 'networkidle' })
+
+    // Evaluate to hide scrollbars for a cleaner shot
+    await page.evaluate(() => {
+      document.body.style.overflow = 'hidden'
+      // Also try to force a class if the theme is class-based (common in Tailwind)
+      document.documentElement.classList.add('dark')
+    })
+
+    console.log('Taking screenshot...')
+    await page.screenshot({ path: 'landing_page_dark.png', fullPage: false })
+    console.log('Screenshot saved to landing_page_dark.png')
+  } catch (error) {
+    console.error('Error capturing screenshot:', error)
+  } finally {
+    await browser.close()
+  }
 }
 
-capture();
+capture()
diff --git a/src/app/api/events/annotations/react/route.ts b/src/app/api/events/annotations/react/route.ts
index d8c77b23..db00fb68 100644
--- a/src/app/api/events/annotations/react/route.ts
+++ b/src/app/api/events/annotations/react/route.ts
@@ -8,104 +8,104 @@ export const runtime = 'nodejs'
 const annotationsStore = new Map<string, EventAnnotationRecord[]>()
 
 function findAnnotationById(annotationId: string): EventAnnotationRecord | null {
-    for (const annotations of annotationsStore.values()) {
-        const found = annotations.find((a) => a.id === annotationId)
-        if (found) return found
-    }
-    return null
+  for (const annotations of annotationsStore.values()) {
+    const found = annotations.find((a) => a.id === annotationId)
+    if (found) return found
+  }
+  return null
 }
 
-function updateAnnotation(annotationId: string, updates: Partial<EventAnnotationRecord>): EventAnnotationRecord | null {
-    for (const [eventId, annotations] of annotationsStore.entries()) {
-        const index = annotations.findIndex((a) => a.id === annotationId)
-        if (index !== -1) {
-            const updated = { ...annotations[index], ...updates }
-            annotations[index] = updated
-            annotationsStore.set(eventId, annotations)
-            return updated
-        }
+function updateAnnotation(
+  annotationId: string,
+  updates: Partial<EventAnnotationRecord>
+): EventAnnotationRecord | null {
+  for (const [eventId, annotations] of annotationsStore.entries()) {
+    const index = annotations.findIndex((a) => a.id === annotationId)
+    if (index !== -1) {
+      const updated = { ...annotations[index], ...updates }
+      annotations[index] = updated
+      annotationsStore.set(eventId, annotations)
+      return updated
     }
-    return null
+  }
+  return null
 }
 
 // POST - Add/toggle a reaction to an annotation
 export async function POST(req: NextRequest) {
-    const session = await auth()
-    if (!session?.user) {
-        return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
-    }
+  const session = await auth()
+  if (!session?.user) {
+    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+  }
 
-    const userId = (session.user as { id: string }).id
+  const userId = (session.user as { id: string }).id
 
-    try {
-        const body = await req.json()
-        const { annotationId, emoji } = body
+  try {
+    const body = await req.json()
+    const { annotationId, emoji } = body
 
-        if (!annotationId || !emoji) {
-            return NextResponse.json(
-                { error: 'Missing required fields: annotationId, emoji' },
-                { status: 400 }
-            )
-        }
-
-        // Valid emojis
-        const validEmojis = ['👍', '👎', '❤️', '🎉', '🤔', '👀', '🔥', '💯']
-        if (!validEmojis.includes(emoji)) {
-            return NextResponse.json(
-                { error: 'Invalid emoji. Allowed: ' + validEmojis.join(', ') },
-                { status: 400 }
-            )
-        }
+    if (!annotationId || !emoji) {
+      return NextResponse.json(
+        { error: 'Missing required fields: annotationId, emoji' },
+        { status: 400 }
+      )
+    }
 
-        const annotation = repo.getAnnotationById
-            ? await repo.getAnnotationById(annotationId)
-            : findAnnotationById(annotationId)
+    // Valid emojis
+    const validEmojis = ['👍', '👎', '❤️', '🎉', '🤔', '👀', '🔥', '💯']
+    if (!validEmojis.includes(emoji)) {
+      return NextResponse.json(
+        { error: 'Invalid emoji. Allowed: ' + validEmojis.join(', ') },
+        { status: 400 }
+      )
+    }
 
-        if (!annotation) {
-            return NextResponse.json({ error: 'Annotation not found' }, { status: 404 })
-        }
+    const annotation = repo.getAnnotationById
+      ? await repo.getAnnotationById(annotationId)
+      : findAnnotationById(annotationId)
 
-        // Toggle reaction
-        const reactions = annotation.reactions || []
-        const existingReaction = reactions.find((r) => r.emoji === emoji)
+    if (!annotation) {
+      return NextResponse.json({ error: 'Annotation not found' }, { status: 404 })
+    }
 
-        let updatedReactions
-        if (existingReaction) {
-            // Toggle user in/out of this reaction
-            if (existingReaction.userIds.includes(userId)) {
-                // Remove user
-                existingReaction.userIds = existingReaction.userIds.filter((id) => id !== userId)
-                if (existingReaction.userIds.length === 0) {
-                    // Remove the reaction entirely if no users left
-                    updatedReactions = reactions.filter((r) => r.emoji !== emoji)
-                } else {
-                    updatedReactions = reactions
-                }
-            } else {
-                // Add user
-                existingReaction.userIds.push(userId)
-                updatedReactions = reactions
-            }
-        } else {
-            // Create new reaction
-            updatedReactions = [...reactions, { emoji, userIds: [userId] }]
-        }
+    // Toggle reaction
+    const reactions = annotation.reactions || []
+    const existingReaction = reactions.find((r) => r.emoji === emoji)
 
-        let updated: EventAnnotationRecord | null
-        if (repo.updateEventAnnotation) {
-            updated = await repo.updateEventAnnotation(annotationId, {
-                reactions: updatedReactions,
-            })
+    let updatedReactions
+    if (existingReaction) {
+      // Toggle user in/out of this reaction
+      if (existingReaction.userIds.includes(userId)) {
+        // Remove user
+        existingReaction.userIds = existingReaction.userIds.filter((id) => id !== userId)
+        if (existingReaction.userIds.length === 0) {
+          // Remove the reaction entirely if no users left
+          updatedReactions = reactions.filter((r) => r.emoji !== emoji)
         } else {
-            updated = updateAnnotation(annotationId, { reactions: updatedReactions })
+          updatedReactions = reactions
         }
+      } else {
+        // Add user
+        existingReaction.userIds.push(userId)
+        updatedReactions = reactions
+      }
+    } else {
+      // Create new reaction
+      updatedReactions = [...reactions, { emoji, userIds: [userId] }]
+    }
 
-        return NextResponse.json({ annotation: updated })
-    } catch (error) {
-        console.error('Failed to toggle reaction:', error)
-        return NextResponse.json(
-            { error: 'Failed to toggle reaction' },
-            { status: 500 }
-        )
+    let updated: EventAnnotationRecord | null
+    if (repo.updateEventAnnotation) {
+      updated = await repo.updateEventAnnotation(annotationId, {
+        reactions: updatedReactions,
+      })
+    } else {
+      updated = updateAnnotation(annotationId, { reactions: updatedReactions })
     }
+
+    return NextResponse.json({ annotation: updated })
+  } catch (error) {
+    console.error('Failed to toggle reaction:', error)
+    return NextResponse.json({ error: 'Failed to toggle reaction' }, { status: 500 })
+  }
 }
diff --git a/src/app/api/events/annotations/route.ts b/src/app/api/events/annotations/route.ts
index 7ed94c26..caca9380 100644
--- a/src/app/api/events/annotations/route.ts
+++ b/src/app/api/events/annotations/route.ts
@@ -9,243 +9,237 @@ export const runtime = 'nodejs'
 const annotationsStore = new Map<string, EventAnnotationRecord[]>()
 
 function getAnnotationsForEvent(eventId: string): EventAnnotationRecord[] {
-    return annotationsStore.get(eventId) || []
+  return annotationsStore.get(eventId) || []
 }
 
 function addAnnotation(annotation: EventAnnotationRecord): void {
-    const existing = annotationsStore.get(annotation.eventId) || []
-    annotationsStore.set(annotation.eventId, [...existing, annotation])
+  const existing = annotationsStore.get(annotation.eventId) || []
+  annotationsStore.set(annotation.eventId, [...existing, annotation])
 }
 
 function findAnnotationById(annotationId: string): EventAnnotationRecord | null {
-    for (const annotations of annotationsStore.values()) {
-        const found = annotations.find((a) => a.id === annotationId)
-        if (found) return found
-    }
-    return null
+  for (const annotations of annotationsStore.values()) {
+    const found = annotations.find((a) => a.id === annotationId)
+    if (found) return found
+  }
+  return null
 }
 
-function updateAnnotation(annotationId: string, updates: Partial<EventAnnotationRecord>): EventAnnotationRecord | null {
-    for (const [eventId, annotations] of annotationsStore.entries()) {
-        const index = annotations.findIndex((a) => a.id === annotationId)
-        if (index !== -1) {
-            const updated = { ...annotations[index], ...updates }
-            annotations[index] = updated
-            annotationsStore.set(eventId, annotations)
-            return updated
-        }
-    }
-    return null
+function updateAnnotation(
+  annotationId: string,
+  updates: Partial<EventAnnotationRecord>
+): EventAnnotationRecord | null {
+  for (const [eventId, annotations] of annotationsStore.entries()) {
+    const index = annotations.findIndex((a) => a.id === annotationId)
+    if (index !== -1) {
+      const updated = { ...annotations[index], ...updates }
+      annotations[index] = updated
+      annotationsStore.set(eventId, annotations)
+      return updated
+    }
+  }
+  return null
 }
 
 function removeAnnotation(annotationId: string): boolean {
-    for (const [eventId, annotations] of annotationsStore.entries()) {
-        const filtered = annotations.filter((a) => a.id !== annotationId)
-        if (filtered.length !== annotations.length) {
-            annotationsStore.set(eventId, filtered)
-            return true
-        }
-    }
-    return false
+  for (const [eventId, annotations] of annotationsStore.entries()) {
+    const filtered = annotations.filter((a) => a.id !== annotationId)
+    if (filtered.length !== annotations.length) {
+      annotationsStore.set(eventId, filtered)
+      return true
+    }
+  }
+  return false
 }
 
 // GET - Fetch annotations for an event
 export async function GET(req: NextRequest) {
-    const session = await auth()
-    if (!session?.user) {
-        return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+  const session = await auth()
+  if (!session?.user) {
+    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+  }
+
+  const url = new URL(req.url)
+  const eventId = url.searchParams.get('eventId')
+
+  if (!eventId) {
+    return NextResponse.json({ error: 'Missing eventId parameter' }, { status: 400 })
+  }
+
+  try {
+    // Try repo first, fall back to in-memory
+    const annotations = repo.getEventAnnotations
+      ? await repo.getEventAnnotations(eventId)
+      : getAnnotationsForEvent(eventId)
+    return NextResponse.json({ annotations })
+  } catch (error) {
+    console.error('Failed to fetch annotations:', error)
+    return NextResponse.json({ error: 'Failed to fetch annotations' }, { status: 500 })
+  }
+}
+
+// POST - Create a new annotation
+export async function POST(req: NextRequest) {
+  const session = await auth()
+  if (!session?.user) {
+    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+  }
+
+  const user = session.user as { id: string; name?: string; email?: string; image?: string }
+  const userId = user.id
+  const userName = user.name || user.email?.split('@')[0] || 'User'
+  const userAvatar = user.image
+
+  try {
+    const body = await req.json()
+    const { eventId, content, parentId } = body
+
+    if (!eventId || !content?.trim()) {
+      return NextResponse.json(
+        { error: 'Missing required fields: eventId, content' },
+        { status: 400 }
+      )
     }
 
-    const url = new URL(req.url)
-    const eventId = url.searchParams.get('eventId')
+    // Parse @mentions from content
+    const mentionRegex = /@(\w+)/g
+    const mentions: string[] = []
+    let match
+    while ((match = mentionRegex.exec(content)) !== null) {
+      mentions.push(match[1])
+    }
 
-    if (!eventId) {
-        return NextResponse.json({ error: 'Missing eventId parameter' }, { status: 400 })
+    const annotation: EventAnnotationRecord = {
+      id: randomUUID(),
+      eventId,
+      userId,
+      userName,
+      userAvatar,
+      content: content.trim(),
+      createdAt: Date.now(),
+      parentId: parentId || undefined,
+      mentions: mentions.length > 0 ? mentions : undefined,
+      reactions: [],
     }
 
-    try {
-        // Try repo first, fall back to in-memory
-        const annotations = repo.getEventAnnotations
-            ? await repo.getEventAnnotations(eventId)
-            : getAnnotationsForEvent(eventId)
-        return NextResponse.json({ annotations })
-    } catch (error) {
-        console.error('Failed to fetch annotations:', error)
-        return NextResponse.json(
-            { error: 'Failed to fetch annotations' },
-            { status: 500 }
-        )
+    // Try repo first, fall back to in-memory
+    let created: EventAnnotationRecord
+    if (repo.createEventAnnotation) {
+      created = await repo.createEventAnnotation(annotation)
+    } else {
+      addAnnotation(annotation)
+      created = annotation
     }
-}
 
-// POST - Create a new annotation
-export async function POST(req: NextRequest) {
-    const session = await auth()
-    if (!session?.user) {
-        return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
-    }
-
-    const user = session.user as { id: string; name?: string; email?: string; image?: string }
-    const userId = user.id
-    const userName = user.name || user.email?.split('@')[0] || 'User'
-    const userAvatar = user.image
-
-    try {
-        const body = await req.json()
-        const { eventId, content, parentId } = body
-
-        if (!eventId || !content?.trim()) {
-            return NextResponse.json(
-                { error: 'Missing required fields: eventId, content' },
-                { status: 400 }
-            )
-        }
-
-        // Parse @mentions from content
-        const mentionRegex = /@(\w+)/g
-        const mentions: string[] = []
-        let match
-        while ((match = mentionRegex.exec(content)) !== null) {
-            mentions.push(match[1])
-        }
-
-        const annotation: EventAnnotationRecord = {
-            id: randomUUID(),
-            eventId,
-            userId,
-            userName,
-            userAvatar,
-            content: content.trim(),
-            createdAt: Date.now(),
-            parentId: parentId || undefined,
-            mentions: mentions.length > 0 ? mentions : undefined,
-            reactions: [],
-        }
-
-        // Try repo first, fall back to in-memory
-        let created: EventAnnotationRecord
-        if (repo.createEventAnnotation) {
-            created = await repo.createEventAnnotation(annotation)
-        } else {
-            addAnnotation(annotation)
-            created = annotation
-        }
-
-        // Notify mentioned users (best-effort)
-        if (mentions.length > 0) {
-            try {
-                console.log(`[Annotations] Notifying mentioned users:`, mentions)
-            } catch (notifyError) {
-                console.warn('Failed to notify mentioned users:', notifyError)
-            }
-        }
-
-        return NextResponse.json({ annotation: created }, { status: 201 })
-    } catch (error) {
-        console.error('Failed to create annotation:', error)
-        return NextResponse.json(
-            { error: 'Failed to create annotation' },
-            { status: 500 }
-        )
+    // Notify mentioned users (best-effort)
+    if (mentions.length > 0) {
+      try {
+        console.log(`[Annotations] Notifying mentioned users:`, mentions)
+      } catch (notifyError) {
+        console.warn('Failed to notify mentioned users:', notifyError)
+      }
     }
+
+    return NextResponse.json({ annotation: created }, { status: 201 })
+  } catch (error) {
+    console.error('Failed to create annotation:', error)
+    return NextResponse.json({ error: 'Failed to create annotation' }, { status: 500 })
+  }
 }
 
 // PUT - Update an annotation
 export async function PUT(req: NextRequest) {
-    const session = await auth()
-    if (!session?.user) {
-        return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
-    }
-
-    const userId = (session.user as { id: string }).id
-
-    try {
-        const body = await req.json()
-        const { annotationId, content } = body
-
-        if (!annotationId || !content?.trim()) {
-            return NextResponse.json(
-                { error: 'Missing required fields: annotationId, content' },
-                { status: 400 }
-            )
-        }
-
-        // Verify ownership
-        const existing = repo.getAnnotationById
-            ? await repo.getAnnotationById(annotationId)
-            : findAnnotationById(annotationId)
-
-        if (!existing) {
-            return NextResponse.json({ error: 'Annotation not found' }, { status: 404 })
-        }
-        if (existing.userId !== userId) {
-            return NextResponse.json({ error: 'Not authorized to edit this annotation' }, { status: 403 })
-        }
-
-        const updates = {
-            content: content.trim(),
-            updatedAt: Date.now(),
-            isEdited: true,
-        }
-
-        let updated: EventAnnotationRecord | null
-        if (repo.updateEventAnnotation) {
-            updated = await repo.updateEventAnnotation(annotationId, updates)
-        } else {
-            updated = updateAnnotation(annotationId, updates)
-        }
-
-        return NextResponse.json({ annotation: updated })
-    } catch (error) {
-        console.error('Failed to update annotation:', error)
-        return NextResponse.json(
-            { error: 'Failed to update annotation' },
-            { status: 500 }
-        )
+  const session = await auth()
+  if (!session?.user) {
+    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+  }
+
+  const userId = (session.user as { id: string }).id
+
+  try {
+    const body = await req.json()
+    const { annotationId, content } = body
+
+    if (!annotationId || !content?.trim()) {
+      return NextResponse.json(
+        { error: 'Missing required fields: annotationId, content' },
+        { status: 400 }
+      )
+    }
+
+    // Verify ownership
+    const existing = repo.getAnnotationById
+      ? await repo.getAnnotationById(annotationId)
+      : findAnnotationById(annotationId)
+
+    if (!existing) {
+      return NextResponse.json({ error: 'Annotation not found' }, { status: 404 })
+    }
+    if (existing.userId !== userId) {
+      return NextResponse.json({ error: 'Not authorized to edit this annotation' }, { status: 403 })
     }
+
+    const updates = {
+      content: content.trim(),
+      updatedAt: Date.now(),
+      isEdited: true,
+    }
+
+    let updated: EventAnnotationRecord | null
+    if (repo.updateEventAnnotation) {
+      updated = await repo.updateEventAnnotation(annotationId, updates)
+    } else {
+      updated = updateAnnotation(annotationId, updates)
+    }
+
+    return NextResponse.json({ annotation: updated })
+  } catch (error) {
+    console.error('Failed to update annotation:', error)
+    return NextResponse.json({ error: 'Failed to update annotation' }, { status: 500 })
+  }
 }
 
 // DELETE - Delete an annotation
 export async function DELETE(req: NextRequest) {
-    const session = await auth()
-    if (!session?.user) {
-        return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
-    }
-
-    const userId = (session.user as { id: string }).id
-
-    try {
-        const url = new URL(req.url)
-        const annotationId = url.searchParams.get('annotationId')
-
-        if (!annotationId) {
-            return NextResponse.json({ error: 'Missing annotationId parameter' }, { status: 400 })
-        }
-
-        // Verify ownership
-        const existing = repo.getAnnotationById
-            ? await repo.getAnnotationById(annotationId)
-            : findAnnotationById(annotationId)
-
-        if (!existing) {
-            return NextResponse.json({ error: 'Annotation not found' }, { status: 404 })
-        }
-        if (existing.userId !== userId) {
-            return NextResponse.json({ error: 'Not authorized to delete this annotation' }, { status: 403 })
-        }
-
-        if (repo.deleteEventAnnotation) {
-            await repo.deleteEventAnnotation(annotationId)
-        } else {
-            removeAnnotation(annotationId)
-        }
-
-        return NextResponse.json({ success: true })
-    } catch (error) {
-        console.error('Failed to delete annotation:', error)
-        return NextResponse.json(
-            { error: 'Failed to delete annotation' },
-            { status: 500 }
-        )
+  const session = await auth()
+  if (!session?.user) {
+    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+  }
+
+  const userId = (session.user as { id: string }).id
+
+  try {
+    const url = new URL(req.url)
+    const annotationId = url.searchParams.get('annotationId')
+
+    if (!annotationId) {
+      return NextResponse.json({ error: 'Missing annotationId parameter' }, { status: 400 })
+    }
+
+    // Verify ownership
+    const existing = repo.getAnnotationById
+      ? await repo.getAnnotationById(annotationId)
+      : findAnnotationById(annotationId)
+
+    if (!existing) {
+      return NextResponse.json({ error: 'Annotation not found' }, { status: 404 })
     }
+    if (existing.userId !== userId) {
+      return NextResponse.json(
+        { error: 'Not authorized to delete this annotation' },
+        { status: 403 }
+      )
+    }
+
+    if (repo.deleteEventAnnotation) {
+      await repo.deleteEventAnnotation(annotationId)
+    } else {
+      removeAnnotation(annotationId)
+    }
+
+    return NextResponse.json({ success: true })
+  } catch (error) {
+    console.error('Failed to delete annotation:', error)
+    return NextResponse.json({ error: 'Failed to delete annotation' }, { status: 500 })
+  }
 }
diff --git a/src/app/api/request-access/route.ts b/src/app/api/request-access/route.ts
index a1baa63e..1efe261b 100644
--- a/src/app/api/request-access/route.ts
+++ b/src/app/api/request-access/route.ts
@@ -59,7 +59,8 @@ export async function POST(request: Request) {
 
     // Send email to admin
     const adminEmail = process.env.RESEND_TO_EMAIL || 'amethaaarjav@gmail.com'
-    const fromEmail = process.env.RESEND_FROM_EMAIL || 'Aarjav from FluxLens <aarjav@fluxlensai.com>'
+    const fromEmail =
+      process.env.RESEND_FROM_EMAIL || 'Aarjav from FluxLens <aarjav@fluxlensai.com>'
 
     const { data, error } = await resend.emails.send({
       from: fromEmail,
diff --git a/src/app/api/user/preferences/route.ts b/src/app/api/user/preferences/route.ts
index 1407ab02..ab54c5ee 100644
--- a/src/app/api/user/preferences/route.ts
+++ b/src/app/api/user/preferences/route.ts
@@ -6,61 +6,52 @@ export const runtime = 'nodejs'
 
 // GET - Fetch user preferences
 export async function GET(req: NextRequest) {
-    const session = await auth()
-    if (!session?.user) {
-        return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
-    }
-
-    const user = session.user as { id: string; organizationId?: string }
-    const userId = user.id
-    const orgId = user.organizationId || 'default'
-
-    try {
-        const preferences = await repo.getUserPreferences(orgId, userId)
-        return NextResponse.json({ preferences })
-    } catch (error) {
-        console.error('Failed to fetch preferences:', error)
-        return NextResponse.json(
-            { error: 'Failed to fetch preferences' },
-            { status: 500 }
-        )
-    }
+  const session = await auth()
+  if (!session?.user) {
+    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+  }
+
+  const user = session.user as { id: string; organizationId?: string }
+  const userId = user.id
+  const orgId = user.organizationId || 'default'
+
+  try {
+    const preferences = await repo.getUserPreferences(orgId, userId)
+    return NextResponse.json({ preferences })
+  } catch (error) {
+    console.error('Failed to fetch preferences:', error)
+    return NextResponse.json({ error: 'Failed to fetch preferences' }, { status: 500 })
+  }
 }
 
 // PUT - Update user preferences
 export async function PUT(req: NextRequest) {
-    const session = await auth()
-    if (!session?.user) {
-        return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
-    }
+  const session = await auth()
+  if (!session?.user) {
+    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+  }
 
-    const user = session.user as { id: string; organizationId?: string }
-    const userId = user.id
-    const orgId = user.organizationId || 'default'
-
-    try {
-        const body = await req.json()
-        const { preferences } = body
-
-        if (!preferences || typeof preferences !== 'object') {
-            return NextResponse.json(
-                { error: 'Missing preferences object' },
-                { status: 400 }
-            )
-        }
-
-        // Validate and sanitize preferences
-        const sanitized = sanitizePreferences(preferences)
-
-        const updated = await repo.setUserPreferences(orgId, userId, sanitized)
-        return NextResponse.json({ preferences: updated })
-    } catch (error) {
-        console.error('Failed to update preferences:', error)
-        return NextResponse.json(
-            { error: 'Failed to update preferences' },
-            { status: 500 }
-        )
+  const user = session.user as { id: string; organizationId?: string }
+  const userId = user.id
+  const orgId = user.organizationId || 'default'
+
+  try {
+    const body = await req.json()
+    const { preferences } = body
+
+    if (!preferences || typeof preferences !== 'object') {
+      return NextResponse.json({ error: 'Missing preferences object' }, { status: 400 })
     }
+
+    // Validate and sanitize preferences
+    const sanitized = sanitizePreferences(preferences)
+
+    const updated = await repo.setUserPreferences(orgId, userId, sanitized)
+    return NextResponse.json({ preferences: updated })
+  } catch (error) {
+    console.error('Failed to update preferences:', error)
+    return NextResponse.json({ error: 'Failed to update preferences' }, { status: 500 })
+  }
 }
 
 // ============================================================================
@@ -68,102 +59,102 @@ export async function PUT(req: NextRequest) {
 // ============================================================================
 
 interface PreferencesInput {
-    theme?: string
-    density?: string
-    sidebarCollapsed?: boolean
-    showHealthScore?: boolean
-    showQuickActions?: boolean
-    emailNotifications?: boolean
-    pushNotifications?: boolean
-    slackNotifications?: boolean
-    notifyOnCritical?: boolean
-    notifyOnHigh?: boolean
-    notifyOnResolved?: boolean
-    digestFrequency?: string
-    defaultTimeWindow?: string
-    defaultDepartments?: string[]
-    defaultRiskLevels?: string[]
-    showOnlyUnresolved?: boolean
-    defaultView?: string
-    chartAnimations?: boolean
-    autoRefreshInterval?: number
-    [key: string]: unknown
+  theme?: string
+  density?: string
+  sidebarCollapsed?: boolean
+  showHealthScore?: boolean
+  showQuickActions?: boolean
+  emailNotifications?: boolean
+  pushNotifications?: boolean
+  slackNotifications?: boolean
+  notifyOnCritical?: boolean
+  notifyOnHigh?: boolean
+  notifyOnResolved?: boolean
+  digestFrequency?: string
+  defaultTimeWindow?: string
+  defaultDepartments?: string[]
+  defaultRiskLevels?: string[]
+  showOnlyUnresolved?: boolean
+  defaultView?: string
+  chartAnimations?: boolean
+  autoRefreshInterval?: number
+  [key: string]: unknown
 }
 
 function sanitizePreferences(input: PreferencesInput): Record<string, unknown> {
-    const validThemes = ['light', 'dark', 'system']
-    const validDensities = ['comfortable', 'compact']
-    const validDigests = ['realtime', 'hourly', 'daily', 'weekly']
-    const validViews = ['overview', 'departments', 'events', 'insights']
-    const validTimeWindows = ['7d', '30d', '60d', '90d']
-    const validRiskLevels = ['low', 'moderate', 'high', 'critical']
-
-    const sanitized: Record<string, unknown> = {}
-
-    // Theme
-    if (input.theme && validThemes.includes(input.theme)) {
-        sanitized.theme = input.theme
-    }
-
-    // Density
-    if (input.density && validDensities.includes(input.density)) {
-        sanitized.density = input.density
+  const validThemes = ['light', 'dark', 'system']
+  const validDensities = ['comfortable', 'compact']
+  const validDigests = ['realtime', 'hourly', 'daily', 'weekly']
+  const validViews = ['overview', 'departments', 'events', 'insights']
+  const validTimeWindows = ['7d', '30d', '60d', '90d']
+  const validRiskLevels = ['low', 'moderate', 'high', 'critical']
+
+  const sanitized: Record<string, unknown> = {}
+
+  // Theme
+  if (input.theme && validThemes.includes(input.theme)) {
+    sanitized.theme = input.theme
+  }
+
+  // Density
+  if (input.density && validDensities.includes(input.density)) {
+    sanitized.density = input.density
+  }
+
+  // Booleans
+  const booleanKeys = [
+    'sidebarCollapsed',
+    'showHealthScore',
+    'showQuickActions',
+    'emailNotifications',
+    'pushNotifications',
+    'slackNotifications',
+    'notifyOnCritical',
+    'notifyOnHigh',
+    'notifyOnResolved',
+    'showOnlyUnresolved',
+    'chartAnimations',
+  ]
+
+  for (const key of booleanKeys) {
+    if (typeof input[key] === 'boolean') {
+      sanitized[key] = input[key]
     }
-
-    // Booleans
-    const booleanKeys = [
-        'sidebarCollapsed',
-        'showHealthScore',
-        'showQuickActions',
-        'emailNotifications',
-        'pushNotifications',
-        'slackNotifications',
-        'notifyOnCritical',
-        'notifyOnHigh',
-        'notifyOnResolved',
-        'showOnlyUnresolved',
-        'chartAnimations',
-    ]
-
-    for (const key of booleanKeys) {
-        if (typeof input[key] === 'boolean') {
-            sanitized[key] = input[key]
-        }
-    }
-
-    // Digest frequency
-    if (input.digestFrequency && validDigests.includes(input.digestFrequency)) {
-        sanitized.digestFrequency = input.digestFrequency
-    }
-
-    // Time window
-    if (input.defaultTimeWindow && validTimeWindows.includes(input.defaultTimeWindow)) {
-        sanitized.defaultTimeWindow = input.defaultTimeWindow
-    }
-
-    // Default view
-    if (input.defaultView && validViews.includes(input.defaultView)) {
-        sanitized.defaultView = input.defaultView
-    }
-
-    // Auto refresh interval (0-900 seconds)
-    if (typeof input.autoRefreshInterval === 'number') {
-        sanitized.autoRefreshInterval = Math.max(0, Math.min(900, input.autoRefreshInterval))
-    }
-
-    // Default departments (array of strings)
-    if (Array.isArray(input.defaultDepartments)) {
-        sanitized.defaultDepartments = input.defaultDepartments.filter(
-            (d): d is string => typeof d === 'string'
-        )
-    }
-
-    // Default risk levels
-    if (Array.isArray(input.defaultRiskLevels)) {
-        sanitized.defaultRiskLevels = input.defaultRiskLevels.filter(
-            (r): r is string => typeof r === 'string' && validRiskLevels.includes(r)
-        )
-    }
-
-    return sanitized
+  }
+
+  // Digest frequency
+  if (input.digestFrequency && validDigests.includes(input.digestFrequency)) {
+    sanitized.digestFrequency = input.digestFrequency
+  }
+
+  // Time window
+  if (input.defaultTimeWindow && validTimeWindows.includes(input.defaultTimeWindow)) {
+    sanitized.defaultTimeWindow = input.defaultTimeWindow
+  }
+
+  // Default view
+  if (input.defaultView && validViews.includes(input.defaultView)) {
+    sanitized.defaultView = input.defaultView
+  }
+
+  // Auto refresh interval (0-900 seconds)
+  if (typeof input.autoRefreshInterval === 'number') {
+    sanitized.autoRefreshInterval = Math.max(0, Math.min(900, input.autoRefreshInterval))
+  }
+
+  // Default departments (array of strings)
+  if (Array.isArray(input.defaultDepartments)) {
+    sanitized.defaultDepartments = input.defaultDepartments.filter(
+      (d): d is string => typeof d === 'string'
+    )
+  }
+
+  // Default risk levels
+  if (Array.isArray(input.defaultRiskLevels)) {
+    sanitized.defaultRiskLevels = input.defaultRiskLevels.filter(
+      (r): r is string => typeof r === 'string' && validRiskLevels.includes(r)
+    )
+  }
+
+  return sanitized
 }
diff --git a/src/app/template.tsx b/src/app/template.tsx
index 9e8eac63..317b6d4e 100644
--- a/src/app/template.tsx
+++ b/src/app/template.tsx
@@ -1,20 +1,20 @@
-'use client';
+'use client'
 
-import { motion } from 'framer-motion';
-import { usePathname } from 'next/navigation';
+import { motion } from 'framer-motion'
+import { usePathname } from 'next/navigation'
 
 export default function Template({ children }: { children: React.ReactNode }) {
-    const pathname = usePathname();
+  const pathname = usePathname()
 
-    return (
-        <motion.div
-            key={pathname}
-            initial={{ opacity: 0, y: 20 }}
-            animate={{ opacity: 1, y: 0 }}
-            transition={{ ease: 'easeOut', duration: 0.3 }}
-            className="min-h-screen"
-        >
-            {children}
-        </motion.div>
-    );
+  return (
+    <motion.div
+      key={pathname}
+      initial={{ opacity: 0, y: 20 }}
+      animate={{ opacity: 1, y: 0 }}
+      transition={{ ease: 'easeOut', duration: 0.3 }}
+      className="min-h-screen"
+    >
+      {children}
+    </motion.div>
+  )
 }
diff --git a/src/components/ExportButton.tsx b/src/components/ExportButton.tsx
index f368c658..1d3242a8 100644
--- a/src/components/ExportButton.tsx
+++ b/src/components/ExportButton.tsx
@@ -152,7 +152,6 @@ function ExportButton({ variant = 'default', className = '' }: ExportButtonProps
                 stiffness: 300,
                 damping: 20,
               }}
-
               onClick={(e) => e.stopPropagation()}
               className="w-full max-w-md rounded-lg border border-[#E5E7EB] bg-white p-6 shadow-lg"
               role="dialog"
diff --git a/src/components/FilterPanel.tsx b/src/components/FilterPanel.tsx
index 6e7f7dad..7cb855e4 100644
--- a/src/components/FilterPanel.tsx
+++ b/src/components/FilterPanel.tsx
@@ -104,10 +104,11 @@ export default function FilterPanel() {
               <button
                 key={dept}
                 onClick={() => toggleDepartment(dept)}
-                className={`rounded-md px-3 py-1.5 text-xs font-medium transition-all ${isActive
+                className={`rounded-md px-3 py-1.5 text-xs font-medium transition-all ${
+                  isActive
                     ? 'bg-[#6C63FF] text-white'
                     : 'border border-[#E5E5E5] bg-white text-[#666666] hover:border-[#6C63FF] hover:text-[#6C63FF]'
-                  }`}
+                }`}
               >
                 {dept}
               </button>
@@ -134,18 +135,19 @@ export default function FilterPanel() {
               <button
                 key={risk}
                 onClick={() => toggleRiskLevel(risk)}
-                className={`rounded-md px-3 py-1.5 text-xs font-medium capitalize transition-all ${isActive
+                className={`rounded-md px-3 py-1.5 text-xs font-medium capitalize transition-all ${
+                  isActive
                     ? `bg-[${colors.bg}] text-white`
                     : `border border-[#E5E5E5] bg-white text-[${colors.text}] hover:border-[${colors.bg}] hover:bg-[${colors.hover}]`
-                  }`}
+                }`}
                 style={
                   isActive
                     ? { backgroundColor: colors.bg, color: '#FFFFFF' }
                     : {
-                      borderColor: '#E5E5E5',
-                      backgroundColor: '#FFFFFF',
-                      color: colors.text,
-                    }
+                        borderColor: '#E5E5E5',
+                        backgroundColor: '#FFFFFF',
+                        color: colors.text,
+                      }
                 }
               >
                 {risk}
@@ -165,10 +167,11 @@ export default function FilterPanel() {
               <button
                 key={type}
                 onClick={() => toggleEventType(type)}
-                className={`rounded-md px-3 py-1.5 text-xs font-medium capitalize transition-all ${isActive
+                className={`rounded-md px-3 py-1.5 text-xs font-medium capitalize transition-all ${
+                  isActive
                     ? 'bg-[#6C63FF] text-white'
                     : 'border border-[#E5E5E5] bg-white text-[#666666] hover:border-[#6C63FF] hover:text-[#6C63FF]'
-                  }`}
+                }`}
               >
                 {type.replace('_', ' ')}
               </button>
@@ -182,12 +185,14 @@ export default function FilterPanel() {
         <span className="text-xs text-[#666666]">Show only unresolved</span>
         <button
           onClick={() => setFilters({ showOnlyUnresolved: !filters.showOnlyUnresolved })}
-          className={`relative inline-flex h-6 w-11 items-center rounded-full transition-colors ${filters.showOnlyUnresolved ? 'bg-[#6C63FF]' : 'bg-[#E5E5E5]'
-            }`}
+          className={`relative inline-flex h-6 w-11 items-center rounded-full transition-colors ${
+            filters.showOnlyUnresolved ? 'bg-[#6C63FF]' : 'bg-[#E5E5E5]'
+          }`}
         >
           <span
-            className={`inline-block h-4 w-4 transform rounded-full bg-white transition-transform ${filters.showOnlyUnresolved ? 'translate-x-6' : 'translate-x-1'
-              }`}
+            className={`inline-block h-4 w-4 transform rounded-full bg-white transition-transform ${
+              filters.showOnlyUnresolved ? 'translate-x-6' : 'translate-x-1'
+            }`}
           />
         </button>
       </div>
diff --git a/src/components/FluxLensLogo.tsx b/src/components/FluxLensLogo.tsx
index a2ff4a28..be665f33 100644
--- a/src/components/FluxLensLogo.tsx
+++ b/src/components/FluxLensLogo.tsx
@@ -63,10 +63,7 @@ export function FluxLensLogo({
           alt="FluxLens"
           fill
           sizes={`${iconPixelSize}px`}
-          className={cn(
-            'object-contain opacity-95',
-            theme === 'light' && 'brightness-0'
-          )}
+          className={cn('object-contain opacity-95', theme === 'light' && 'brightness-0')}
         />
       </div>
 
diff --git a/src/components/analytics/RiskWeightedTimeline.tsx b/src/components/analytics/RiskWeightedTimeline.tsx
index 83750438..b8985226 100644
--- a/src/components/analytics/RiskWeightedTimeline.tsx
+++ b/src/components/analytics/RiskWeightedTimeline.tsx
@@ -116,8 +116,8 @@ export function RiskWeightedTimeline({
     const avgConfidence =
       filteredEvents.length > 0
         ? Math.round(
-          (filteredEvents.reduce((acc, e) => acc + e.confidence, 0) / filteredEvents.length) * 100
-        )
+            (filteredEvents.reduce((acc, e) => acc + e.confidence, 0) / filteredEvents.length) * 100
+          )
         : 0
     return { critical, high, avgConfidence, total: filteredEvents.length }
   }, [filteredEvents])
@@ -214,7 +214,10 @@ export function RiskWeightedTimeline({
                     aria-pressed={isEnabled}
                     aria-label={`Filter ${config.label} events`}
                   >
-                    <LaneIcon className="size-3" style={{ color: isEnabled ? config.text : undefined }} />
+                    <LaneIcon
+                      className="size-3"
+                      style={{ color: isEnabled ? config.text : undefined }}
+                    />
                     {config.label}
                     <span className="rounded bg-white/10 px-1 text-[9px]">
                       {events.filter((e) => e.lane === lane).length}
@@ -241,7 +244,9 @@ export function RiskWeightedTimeline({
                 <Info className="mb-2 size-8 text-slate-500" />
                 <p className="text-sm text-slate-400">No events match the current filters</p>
                 <button
-                  onClick={() => setEnabledLanes(new Set(['handoff', 'latency', 'meeting', 'engagement']))}
+                  onClick={() =>
+                    setEnabledLanes(new Set(['handoff', 'latency', 'meeting', 'engagement']))
+                  }
                   className="mt-2 text-xs text-sky-400 hover:underline"
                 >
                   Reset filters
@@ -385,7 +390,9 @@ export function RiskWeightedTimeline({
                                     <p className="mb-0.5 text-[10px] font-semibold text-slate-500">
                                       Mitigation
                                     </p>
-                                    <p className="text-[11px] text-emerald-400">{event.mitigation}</p>
+                                    <p className="text-[11px] text-emerald-400">
+                                      {event.mitigation}
+                                    </p>
                                   </div>
                                 )}
                               </div>
@@ -404,15 +411,17 @@ export function RiskWeightedTimeline({
           <div className="mt-4 flex items-center justify-between border-t border-white/10 pt-3">
             <div className="flex items-center gap-3">
               <span className="text-[10px] text-slate-500">Severity:</span>
-              {(Object.keys(severityColors) as Array<keyof typeof severityColors>).map((severity) => (
-                <div key={severity} className="flex items-center gap-1">
-                  <div
-                    className="h-2 w-2 rounded-full"
-                    style={{ backgroundColor: severityColors[severity] }}
-                  />
-                  <span className="text-[10px] capitalize text-slate-400">{severity}</span>
-                </div>
-              ))}
+              {(Object.keys(severityColors) as Array<keyof typeof severityColors>).map(
+                (severity) => (
+                  <div key={severity} className="flex items-center gap-1">
+                    <div
+                      className="h-2 w-2 rounded-full"
+                      style={{ backgroundColor: severityColors[severity] }}
+                    />
+                    <span className="text-[10px] capitalize text-slate-400">{severity}</span>
+                  </div>
+                )
+              )}
             </div>
             <span className="text-[10px] text-slate-500">
               {filteredEvents.length} of {events.length} events
diff --git a/src/components/empty/loading-section.tsx b/src/components/empty/loading-section.tsx
index 0c5b835a..4f11a6bf 100644
--- a/src/components/empty/loading-section.tsx
+++ b/src/components/empty/loading-section.tsx
@@ -11,14 +11,14 @@ export function LoadingSection() {
     show: {
       opacity: 1,
       transition: {
-        staggerChildren: 0.1
-      }
-    }
+        staggerChildren: 0.1,
+      },
+    },
   }
 
   const item = {
     hidden: { opacity: 0, y: 10 },
-    show: { opacity: 1, y: 0 }
+    show: { opacity: 1, y: 0 },
   }
 
   return (
@@ -48,4 +48,3 @@ export function LoadingSection() {
     </Surface>
   )
 }
-
diff --git a/src/components/events/EventAnnotations.tsx b/src/components/events/EventAnnotations.tsx
index 5b97c1d1..9285826b 100644
--- a/src/components/events/EventAnnotations.tsx
+++ b/src/components/events/EventAnnotations.tsx
@@ -3,17 +3,17 @@
 import { useState, useCallback, useRef, useEffect } from 'react'
 import { motion, AnimatePresence } from 'framer-motion'
 import {
-    MessageCircle,
-    Send,
-    User,
-    Clock,
-    MoreHorizontal,
-    Edit2,
-    Trash2,
-    Reply,
-    ThumbsUp,
-    Loader2,
-    AlertCircle,
+  MessageCircle,
+  Send,
+  User,
+  Clock,
+  MoreHorizontal,
+  Edit2,
+  Trash2,
+  Reply,
+  ThumbsUp,
+  Loader2,
+  AlertCircle,
 } from 'lucide-react'
 import { cn } from '@/lib/utils'
 import { notify } from '@/lib/notify'
@@ -21,437 +21,451 @@ import { useHaptic } from '@/hooks/use-haptic'
 import { formatDistanceToNow } from 'date-fns'
 
 export interface Annotation {
-    id: string
-    eventId: string
-    userId: string
-    userName: string
-    userAvatar?: string
-    content: string
-    createdAt: number
-    updatedAt?: number
-    parentId?: string // For replies
-    reactions?: { emoji: string; userIds: string[] }[]
-    mentions?: string[]
-    isEdited?: boolean
+  id: string
+  eventId: string
+  userId: string
+  userName: string
+  userAvatar?: string
+  content: string
+  createdAt: number
+  updatedAt?: number
+  parentId?: string // For replies
+  reactions?: { emoji: string; userIds: string[] }[]
+  mentions?: string[]
+  isEdited?: boolean
 }
 
 interface EventAnnotationsProps {
-    eventId: string
-    annotations: Annotation[]
-    currentUserId: string
-    currentUserName: string
-    onAddAnnotation: (content: string, parentId?: string) => Promise<void>
-    onEditAnnotation: (id: string, content: string) => Promise<void>
-    onDeleteAnnotation: (id: string) => Promise<void>
-    onReact: (id: string, emoji: string) => Promise<void>
-    className?: string
+  eventId: string
+  annotations: Annotation[]
+  currentUserId: string
+  currentUserName: string
+  onAddAnnotation: (content: string, parentId?: string) => Promise<void>
+  onEditAnnotation: (id: string, content: string) => Promise<void>
+  onDeleteAnnotation: (id: string) => Promise<void>
+  onReact: (id: string, emoji: string) => Promise<void>
+  className?: string
 }
 
 export default function EventAnnotations({
-    eventId,
-    annotations,
-    currentUserId,
-    currentUserName,
-    onAddAnnotation,
-    onEditAnnotation,
-    onDeleteAnnotation,
-    onReact,
-    className,
+  eventId,
+  annotations,
+  currentUserId,
+  currentUserName,
+  onAddAnnotation,
+  onEditAnnotation,
+  onDeleteAnnotation,
+  onReact,
+  className,
 }: EventAnnotationsProps) {
-    const { trigger } = useHaptic()
-    const [newComment, setNewComment] = useState('')
-    const [isSubmitting, setIsSubmitting] = useState(false)
-    const [replyingTo, setReplyingTo] = useState<string | null>(null)
-    const [editingId, setEditingId] = useState<string | null>(null)
-    const [editContent, setEditContent] = useState('')
-    const [expandedReplies, setExpandedReplies] = useState<Set<string>>(new Set())
-    const [showActionsFor, setShowActionsFor] = useState<string | null>(null)
-    const inputRef = useRef<HTMLTextAreaElement>(null)
-    const actionsRef = useRef<HTMLDivElement>(null)
+  const { trigger } = useHaptic()
+  const [newComment, setNewComment] = useState('')
+  const [isSubmitting, setIsSubmitting] = useState(false)
+  const [replyingTo, setReplyingTo] = useState<string | null>(null)
+  const [editingId, setEditingId] = useState<string | null>(null)
+  const [editContent, setEditContent] = useState('')
+  const [expandedReplies, setExpandedReplies] = useState<Set<string>>(new Set())
+  const [showActionsFor, setShowActionsFor] = useState<string | null>(null)
+  const inputRef = useRef<HTMLTextAreaElement>(null)
+  const actionsRef = useRef<HTMLDivElement>(null)
 
-    // Close actions menu when clicking outside
-    useEffect(() => {
-        const handleClickOutside = (e: MouseEvent) => {
-            if (actionsRef.current && !actionsRef.current.contains(e.target as Node)) {
-                setShowActionsFor(null)
-            }
-        }
-        document.addEventListener('mousedown', handleClickOutside)
-        return () => document.removeEventListener('mousedown', handleClickOutside)
-    }, [])
+  // Close actions menu when clicking outside
+  useEffect(() => {
+    const handleClickOutside = (e: MouseEvent) => {
+      if (actionsRef.current && !actionsRef.current.contains(e.target as Node)) {
+        setShowActionsFor(null)
+      }
+    }
+    document.addEventListener('mousedown', handleClickOutside)
+    return () => document.removeEventListener('mousedown', handleClickOutside)
+  }, [])
 
-    // Organize annotations into threads
-    const threads = annotations.reduce((acc, annotation) => {
-        if (!annotation.parentId) {
-            acc.push({
-                ...annotation,
-                replies: annotations.filter((a) => a.parentId === annotation.id),
-            })
-        }
-        return acc
-    }, [] as (Annotation & { replies: Annotation[] })[])
+  // Organize annotations into threads
+  const threads = annotations.reduce(
+    (acc, annotation) => {
+      if (!annotation.parentId) {
+        acc.push({
+          ...annotation,
+          replies: annotations.filter((a) => a.parentId === annotation.id),
+        })
+      }
+      return acc
+    },
+    [] as (Annotation & { replies: Annotation[] })[]
+  )
 
-    const handleSubmit = useCallback(async () => {
-        if (!newComment.trim() || isSubmitting) return
+  const handleSubmit = useCallback(async () => {
+    if (!newComment.trim() || isSubmitting) return
 
-        setIsSubmitting(true)
-        trigger('light')
+    setIsSubmitting(true)
+    trigger('light')
 
-        try {
-            await onAddAnnotation(newComment.trim(), replyingTo || undefined)
-            setNewComment('')
-            setReplyingTo(null)
-            trigger('success')
-            notify.success(replyingTo ? 'Reply added' : 'Comment added')
-        } catch (error) {
-            trigger('error')
-            notify.error(error instanceof Error ? error.message : 'Failed to add comment')
-        } finally {
-            setIsSubmitting(false)
-        }
-    }, [newComment, isSubmitting, replyingTo, onAddAnnotation, trigger])
+    try {
+      await onAddAnnotation(newComment.trim(), replyingTo || undefined)
+      setNewComment('')
+      setReplyingTo(null)
+      trigger('success')
+      notify.success(replyingTo ? 'Reply added' : 'Comment added')
+    } catch (error) {
+      trigger('error')
+      notify.error(error instanceof Error ? error.message : 'Failed to add comment')
+    } finally {
+      setIsSubmitting(false)
+    }
+  }, [newComment, isSubmitting, replyingTo, onAddAnnotation, trigger])
 
-    const handleEdit = useCallback(async (id: string) => {
-        if (!editContent.trim() || isSubmitting) return
+  const handleEdit = useCallback(
+    async (id: string) => {
+      if (!editContent.trim() || isSubmitting) return
 
-        setIsSubmitting(true)
-        trigger('light')
+      setIsSubmitting(true)
+      trigger('light')
 
-        try {
-            await onEditAnnotation(id, editContent.trim())
-            setEditingId(null)
-            setEditContent('')
-            trigger('success')
-            notify.success('Comment updated')
-        } catch (error) {
-            trigger('error')
-            notify.error(error instanceof Error ? error.message : 'Failed to update comment')
-        } finally {
-            setIsSubmitting(false)
-        }
-    }, [editContent, isSubmitting, onEditAnnotation, trigger])
+      try {
+        await onEditAnnotation(id, editContent.trim())
+        setEditingId(null)
+        setEditContent('')
+        trigger('success')
+        notify.success('Comment updated')
+      } catch (error) {
+        trigger('error')
+        notify.error(error instanceof Error ? error.message : 'Failed to update comment')
+      } finally {
+        setIsSubmitting(false)
+      }
+    },
+    [editContent, isSubmitting, onEditAnnotation, trigger]
+  )
 
-    const handleDelete = useCallback(async (id: string) => {
-        trigger('light')
-        try {
-            await onDeleteAnnotation(id)
-            trigger('success')
-            notify.success('Comment deleted')
-        } catch (error) {
-            trigger('error')
-            notify.error(error instanceof Error ? error.message : 'Failed to delete comment')
-        }
-    }, [onDeleteAnnotation, trigger])
+  const handleDelete = useCallback(
+    async (id: string) => {
+      trigger('light')
+      try {
+        await onDeleteAnnotation(id)
+        trigger('success')
+        notify.success('Comment deleted')
+      } catch (error) {
+        trigger('error')
+        notify.error(error instanceof Error ? error.message : 'Failed to delete comment')
+      }
+    },
+    [onDeleteAnnotation, trigger]
+  )
 
-    const handleReaction = useCallback(async (id: string, emoji: string) => {
-        trigger('light')
-        try {
-            await onReact(id, emoji)
-        } catch (error) {
-            trigger('error')
-        }
-    }, [onReact, trigger])
+  const handleReaction = useCallback(
+    async (id: string, emoji: string) => {
+      trigger('light')
+      try {
+        await onReact(id, emoji)
+      } catch (error) {
+        trigger('error')
+      }
+    },
+    [onReact, trigger]
+  )
 
-    const startReply = useCallback((annotationId: string) => {
-        setReplyingTo(annotationId)
-        setExpandedReplies((prev) => new Set([...prev, annotationId]))
-        inputRef.current?.focus()
-    }, [])
+  const startReply = useCallback((annotationId: string) => {
+    setReplyingTo(annotationId)
+    setExpandedReplies((prev) => new Set([...prev, annotationId]))
+    inputRef.current?.focus()
+  }, [])
 
-    const startEdit = useCallback((annotation: Annotation) => {
-        setEditingId(annotation.id)
-        setEditContent(annotation.content)
-        setShowActionsFor(null)
-    }, [])
+  const startEdit = useCallback((annotation: Annotation) => {
+    setEditingId(annotation.id)
+    setEditContent(annotation.content)
+    setShowActionsFor(null)
+  }, [])
 
-    const formatTime = (timestamp: number) => {
-        return formatDistanceToNow(new Date(timestamp), { addSuffix: true })
-    }
+  const formatTime = (timestamp: number) => {
+    return formatDistanceToNow(new Date(timestamp), { addSuffix: true })
+  }
+
+  return (
+    <div className={cn('space-y-4', className)}>
+      {/* Header */}
+      <div className="flex items-center justify-between">
+        <div className="flex items-center gap-2">
+          <MessageCircle className="size-5 text-[#6C63FF]" />
+          <h3 className="text-sm font-semibold text-[#333333]">Team Comments</h3>
+          <span className="rounded-full bg-[#6C63FF]/10 px-2 py-0.5 text-xs font-medium text-[#6C63FF]">
+            {annotations.length}
+          </span>
+        </div>
+      </div>
+
+      {/* Comment Input */}
+      <div className="rounded-xl border border-[#E5E7EB] bg-white p-4 shadow-sm">
+        {replyingTo && (
+          <div className="mb-3 flex items-center justify-between rounded-lg bg-[#F8FAFC] px-3 py-2">
+            <span className="text-xs text-[#666666]">
+              Replying to{' '}
+              <span className="font-medium text-[#333333]">
+                {annotations.find((a) => a.id === replyingTo)?.userName}
+              </span>
+            </span>
+            <button
+              onClick={() => setReplyingTo(null)}
+              className="text-[#9CA3AF] hover:text-[#666666] transition-colors"
+            >
+              ×
+            </button>
+          </div>
+        )}
+
+        <div className="flex gap-3">
+          <div className="flex size-8 shrink-0 items-center justify-center rounded-full bg-[#6C63FF] text-white text-xs font-semibold">
+            {currentUserName.charAt(0).toUpperCase()}
+          </div>
+
+          <div className="flex-1 space-y-3">
+            <textarea
+              ref={inputRef}
+              value={newComment}
+              onChange={(e) => setNewComment(e.target.value)}
+              placeholder="Add a comment or @mention teammates..."
+              rows={2}
+              className={cn(
+                'w-full resize-none rounded-lg border border-[#E5E7EB] bg-[#FAFAFA] px-4 py-3 text-sm text-[#333333] placeholder:text-[#9CA3AF]',
+                'focus:border-[#6C63FF] focus:bg-white focus:outline-none focus:ring-2 focus:ring-[#6C63FF]/20',
+                'transition-all duration-150'
+              )}
+              onKeyDown={(e) => {
+                if (e.key === 'Enter' && (e.metaKey || e.ctrlKey)) {
+                  e.preventDefault()
+                  handleSubmit()
+                }
+              }}
+            />
 
-    return (
-        <div className={cn('space-y-4', className)}>
-            {/* Header */}
             <div className="flex items-center justify-between">
-                <div className="flex items-center gap-2">
-                    <MessageCircle className="size-5 text-[#6C63FF]" />
-                    <h3 className="text-sm font-semibold text-[#333333]">
-                        Team Comments
-                    </h3>
-                    <span className="rounded-full bg-[#6C63FF]/10 px-2 py-0.5 text-xs font-medium text-[#6C63FF]">
-                        {annotations.length}
-                    </span>
-                </div>
+              <p className="text-xs text-[#9CA3AF]">Press ⌘+Enter to send</p>
+              <button
+                onClick={handleSubmit}
+                disabled={!newComment.trim() || isSubmitting}
+                className={cn(
+                  'flex items-center gap-2 rounded-lg px-4 py-2 text-sm font-semibold text-white transition-all',
+                  newComment.trim() && !isSubmitting
+                    ? 'bg-[#6C63FF] hover:bg-[#5A52E6]'
+                    : 'bg-[#D1D5DB] cursor-not-allowed'
+                )}
+              >
+                {isSubmitting ? (
+                  <Loader2 className="size-4 animate-spin" />
+                ) : (
+                  <Send className="size-4" />
+                )}
+                {replyingTo ? 'Reply' : 'Comment'}
+              </button>
             </div>
+          </div>
+        </div>
+      </div>
 
-            {/* Comment Input */}
-            <div className="rounded-xl border border-[#E5E7EB] bg-white p-4 shadow-sm">
-                {replyingTo && (
-                    <div className="mb-3 flex items-center justify-between rounded-lg bg-[#F8FAFC] px-3 py-2">
-                        <span className="text-xs text-[#666666]">
-                            Replying to{' '}
-                            <span className="font-medium text-[#333333]">
-                                {annotations.find((a) => a.id === replyingTo)?.userName}
-                            </span>
-                        </span>
-                        <button
-                            onClick={() => setReplyingTo(null)}
-                            className="text-[#9CA3AF] hover:text-[#666666] transition-colors"
-                        >
-                            ×
-                        </button>
-                    </div>
-                )}
+      {/* Comments List */}
+      <div className="space-y-4">
+        <AnimatePresence mode="popLayout">
+          {threads.length === 0 ? (
+            <motion.div
+              initial={{ opacity: 0 }}
+              animate={{ opacity: 1 }}
+              className="rounded-xl border border-dashed border-[#E5E7EB] bg-[#FAFAFA] p-8 text-center"
+            >
+              <MessageCircle className="mx-auto mb-3 size-10 text-[#D1D5DB]" />
+              <p className="text-sm font-medium text-[#666666]">No comments yet</p>
+              <p className="mt-1 text-xs text-[#9CA3AF]">
+                Be the first to share insights on this event
+              </p>
+            </motion.div>
+          ) : (
+            threads.map((thread) => (
+              <motion.div
+                key={thread.id}
+                initial={{ opacity: 0, y: 10 }}
+                animate={{ opacity: 1, y: 0 }}
+                exit={{ opacity: 0, y: -10 }}
+                className="rounded-xl border border-[#E5E7EB] bg-white shadow-sm"
+              >
+                {/* Main Comment */}
+                <div className="p-4">
+                  <div className="flex gap-3">
+                    {/* Avatar */}
+                    {thread.userAvatar ? (
+                      // eslint-disable-next-line @next/next/no-img-element
+                      <img
+                        src={thread.userAvatar}
+                        alt={thread.userName}
+                        className="size-8 rounded-full"
+                      />
+                    ) : (
+                      <div className="flex size-8 shrink-0 items-center justify-center rounded-full bg-[#6C63FF]/10 text-[#6C63FF] text-xs font-semibold">
+                        {thread.userName.charAt(0).toUpperCase()}
+                      </div>
+                    )}
 
-                <div className="flex gap-3">
-                    <div className="flex size-8 shrink-0 items-center justify-center rounded-full bg-[#6C63FF] text-white text-xs font-semibold">
-                        {currentUserName.charAt(0).toUpperCase()}
-                    </div>
+                    <div className="flex-1 min-w-0">
+                      {/* Header */}
+                      <div className="mb-2 flex items-center justify-between">
+                        <div className="flex items-center gap-2">
+                          <span className="text-sm font-semibold text-[#333333]">
+                            {thread.userName}
+                          </span>
+                          <span className="flex items-center gap-1 text-xs text-[#9CA3AF]">
+                            <Clock className="size-3" />
+                            {formatTime(thread.createdAt)}
+                          </span>
+                          {thread.isEdited && (
+                            <span className="text-xs text-[#9CA3AF]">(edited)</span>
+                          )}
+                        </div>
+
+                        {/* Actions Menu */}
+                        {thread.userId === currentUserId && (
+                          <div className="relative" ref={actionsRef}>
+                            <button
+                              onClick={() =>
+                                setShowActionsFor(showActionsFor === thread.id ? null : thread.id)
+                              }
+                              className="rounded-lg p-1.5 text-[#9CA3AF] hover:bg-[#F8FAFC] hover:text-[#666666] transition-colors"
+                            >
+                              <MoreHorizontal className="size-4" />
+                            </button>
+
+                            <AnimatePresence>
+                              {showActionsFor === thread.id && (
+                                <motion.div
+                                  initial={{ opacity: 0, scale: 0.95 }}
+                                  animate={{ opacity: 1, scale: 1 }}
+                                  exit={{ opacity: 0, scale: 0.95 }}
+                                  className="absolute right-0 top-full z-10 mt-1 w-32 rounded-lg border border-[#E5E7EB] bg-white py-1 shadow-lg"
+                                >
+                                  <button
+                                    onClick={() => startEdit(thread)}
+                                    className="flex w-full items-center gap-2 px-3 py-2 text-left text-sm text-[#333333] hover:bg-[#F8FAFC] transition-colors"
+                                  >
+                                    <Edit2 className="size-3.5" />
+                                    Edit
+                                  </button>
+                                  <button
+                                    onClick={() => handleDelete(thread.id)}
+                                    className="flex w-full items-center gap-2 px-3 py-2 text-left text-sm text-[#DC2626] hover:bg-[#FEF2F2] transition-colors"
+                                  >
+                                    <Trash2 className="size-3.5" />
+                                    Delete
+                                  </button>
+                                </motion.div>
+                              )}
+                            </AnimatePresence>
+                          </div>
+                        )}
+                      </div>
 
-                    <div className="flex-1 space-y-3">
-                        <textarea
-                            ref={inputRef}
-                            value={newComment}
-                            onChange={(e) => setNewComment(e.target.value)}
-                            placeholder="Add a comment or @mention teammates..."
+                      {/* Content */}
+                      {editingId === thread.id ? (
+                        <div className="space-y-2">
+                          <textarea
+                            value={editContent}
+                            onChange={(e) => setEditContent(e.target.value)}
                             rows={2}
-                            className={cn(
-                                'w-full resize-none rounded-lg border border-[#E5E7EB] bg-[#FAFAFA] px-4 py-3 text-sm text-[#333333] placeholder:text-[#9CA3AF]',
-                                'focus:border-[#6C63FF] focus:bg-white focus:outline-none focus:ring-2 focus:ring-[#6C63FF]/20',
-                                'transition-all duration-150'
-                            )}
-                            onKeyDown={(e) => {
-                                if (e.key === 'Enter' && (e.metaKey || e.ctrlKey)) {
-                                    e.preventDefault()
-                                    handleSubmit()
-                                }
-                            }}
-                        />
+                            className="w-full resize-none rounded-lg border border-[#6C63FF] bg-white px-3 py-2 text-sm text-[#333333] focus:outline-none focus:ring-2 focus:ring-[#6C63FF]/20"
+                          />
+                          <div className="flex gap-2">
+                            <button
+                              onClick={() => handleEdit(thread.id)}
+                              disabled={!editContent.trim() || isSubmitting}
+                              className="rounded-md bg-[#6C63FF] px-3 py-1.5 text-xs font-medium text-white hover:bg-[#5A52E6] transition-colors disabled:opacity-50"
+                            >
+                              Save
+                            </button>
+                            <button
+                              onClick={() => {
+                                setEditingId(null)
+                                setEditContent('')
+                              }}
+                              className="rounded-md px-3 py-1.5 text-xs font-medium text-[#666666] hover:bg-[#F8FAFC] transition-colors"
+                            >
+                              Cancel
+                            </button>
+                          </div>
+                        </div>
+                      ) : (
+                        <p className="text-sm text-[#333333] leading-relaxed whitespace-pre-wrap">
+                          {thread.content}
+                        </p>
+                      )}
 
-                        <div className="flex items-center justify-between">
-                            <p className="text-xs text-[#9CA3AF]">
-                                Press ⌘+Enter to send
-                            </p>
+                      {/* Actions Bar */}
+                      {editingId !== thread.id && (
+                        <div className="mt-3 flex items-center gap-4">
+                          <button
+                            onClick={() => handleReaction(thread.id, '👍')}
+                            className="flex items-center gap-1.5 text-xs text-[#666666] hover:text-[#6C63FF] transition-colors"
+                          >
+                            <ThumbsUp className="size-3.5" />
+                            {thread.reactions?.find((r) => r.emoji === '👍')?.userIds.length || ''}
+                          </button>
+                          <button
+                            onClick={() => startReply(thread.id)}
+                            className="flex items-center gap-1.5 text-xs text-[#666666] hover:text-[#6C63FF] transition-colors"
+                          >
+                            <Reply className="size-3.5" />
+                            Reply
+                          </button>
+                          {thread.replies.length > 0 && !expandedReplies.has(thread.id) && (
                             <button
-                                onClick={handleSubmit}
-                                disabled={!newComment.trim() || isSubmitting}
-                                className={cn(
-                                    'flex items-center gap-2 rounded-lg px-4 py-2 text-sm font-semibold text-white transition-all',
-                                    newComment.trim() && !isSubmitting
-                                        ? 'bg-[#6C63FF] hover:bg-[#5A52E6]'
-                                        : 'bg-[#D1D5DB] cursor-not-allowed'
-                                )}
+                              onClick={() =>
+                                setExpandedReplies((prev) => new Set([...prev, thread.id]))
+                              }
+                              className="text-xs font-medium text-[#6C63FF] hover:text-[#5A52E6] transition-colors"
                             >
-                                {isSubmitting ? (
-                                    <Loader2 className="size-4 animate-spin" />
-                                ) : (
-                                    <Send className="size-4" />
-                                )}
-                                {replyingTo ? 'Reply' : 'Comment'}
+                              View {thread.replies.length}{' '}
+                              {thread.replies.length === 1 ? 'reply' : 'replies'}
                             </button>
+                          )}
                         </div>
+                      )}
                     </div>
+                  </div>
                 </div>
-            </div>
 
-            {/* Comments List */}
-            <div className="space-y-4">
-                <AnimatePresence mode="popLayout">
-                    {threads.length === 0 ? (
-                        <motion.div
-                            initial={{ opacity: 0 }}
-                            animate={{ opacity: 1 }}
-                            className="rounded-xl border border-dashed border-[#E5E7EB] bg-[#FAFAFA] p-8 text-center"
-                        >
-                            <MessageCircle className="mx-auto mb-3 size-10 text-[#D1D5DB]" />
-                            <p className="text-sm font-medium text-[#666666]">No comments yet</p>
-                            <p className="mt-1 text-xs text-[#9CA3AF]">
-                                Be the first to share insights on this event
-                            </p>
-                        </motion.div>
-                    ) : (
-                        threads.map((thread) => (
-                            <motion.div
-                                key={thread.id}
-                                initial={{ opacity: 0, y: 10 }}
-                                animate={{ opacity: 1, y: 0 }}
-                                exit={{ opacity: 0, y: -10 }}
-                                className="rounded-xl border border-[#E5E7EB] bg-white shadow-sm"
-                            >
-                                {/* Main Comment */}
-                                <div className="p-4">
-                                    <div className="flex gap-3">
-                                        {/* Avatar */}
-                                        {thread.userAvatar ? (
-                                            <img
-                                                src={thread.userAvatar}
-                                                alt={thread.userName}
-                                                className="size-8 rounded-full"
-                                            />
-                                        ) : (
-                                            <div className="flex size-8 shrink-0 items-center justify-center rounded-full bg-[#6C63FF]/10 text-[#6C63FF] text-xs font-semibold">
-                                                {thread.userName.charAt(0).toUpperCase()}
-                                            </div>
-                                        )}
-
-                                        <div className="flex-1 min-w-0">
-                                            {/* Header */}
-                                            <div className="mb-2 flex items-center justify-between">
-                                                <div className="flex items-center gap-2">
-                                                    <span className="text-sm font-semibold text-[#333333]">
-                                                        {thread.userName}
-                                                    </span>
-                                                    <span className="flex items-center gap-1 text-xs text-[#9CA3AF]">
-                                                        <Clock className="size-3" />
-                                                        {formatTime(thread.createdAt)}
-                                                    </span>
-                                                    {thread.isEdited && (
-                                                        <span className="text-xs text-[#9CA3AF]">(edited)</span>
-                                                    )}
-                                                </div>
-
-                                                {/* Actions Menu */}
-                                                {thread.userId === currentUserId && (
-                                                    <div className="relative" ref={actionsRef}>
-                                                        <button
-                                                            onClick={() => setShowActionsFor(showActionsFor === thread.id ? null : thread.id)}
-                                                            className="rounded-lg p-1.5 text-[#9CA3AF] hover:bg-[#F8FAFC] hover:text-[#666666] transition-colors"
-                                                        >
-                                                            <MoreHorizontal className="size-4" />
-                                                        </button>
-
-                                                        <AnimatePresence>
-                                                            {showActionsFor === thread.id && (
-                                                                <motion.div
-                                                                    initial={{ opacity: 0, scale: 0.95 }}
-                                                                    animate={{ opacity: 1, scale: 1 }}
-                                                                    exit={{ opacity: 0, scale: 0.95 }}
-                                                                    className="absolute right-0 top-full z-10 mt-1 w-32 rounded-lg border border-[#E5E7EB] bg-white py-1 shadow-lg"
-                                                                >
-                                                                    <button
-                                                                        onClick={() => startEdit(thread)}
-                                                                        className="flex w-full items-center gap-2 px-3 py-2 text-left text-sm text-[#333333] hover:bg-[#F8FAFC] transition-colors"
-                                                                    >
-                                                                        <Edit2 className="size-3.5" />
-                                                                        Edit
-                                                                    </button>
-                                                                    <button
-                                                                        onClick={() => handleDelete(thread.id)}
-                                                                        className="flex w-full items-center gap-2 px-3 py-2 text-left text-sm text-[#DC2626] hover:bg-[#FEF2F2] transition-colors"
-                                                                    >
-                                                                        <Trash2 className="size-3.5" />
-                                                                        Delete
-                                                                    </button>
-                                                                </motion.div>
-                                                            )}
-                                                        </AnimatePresence>
-                                                    </div>
-                                                )}
-                                            </div>
-
-                                            {/* Content */}
-                                            {editingId === thread.id ? (
-                                                <div className="space-y-2">
-                                                    <textarea
-                                                        value={editContent}
-                                                        onChange={(e) => setEditContent(e.target.value)}
-                                                        rows={2}
-                                                        className="w-full resize-none rounded-lg border border-[#6C63FF] bg-white px-3 py-2 text-sm text-[#333333] focus:outline-none focus:ring-2 focus:ring-[#6C63FF]/20"
-                                                    />
-                                                    <div className="flex gap-2">
-                                                        <button
-                                                            onClick={() => handleEdit(thread.id)}
-                                                            disabled={!editContent.trim() || isSubmitting}
-                                                            className="rounded-md bg-[#6C63FF] px-3 py-1.5 text-xs font-medium text-white hover:bg-[#5A52E6] transition-colors disabled:opacity-50"
-                                                        >
-                                                            Save
-                                                        </button>
-                                                        <button
-                                                            onClick={() => {
-                                                                setEditingId(null)
-                                                                setEditContent('')
-                                                            }}
-                                                            className="rounded-md px-3 py-1.5 text-xs font-medium text-[#666666] hover:bg-[#F8FAFC] transition-colors"
-                                                        >
-                                                            Cancel
-                                                        </button>
-                                                    </div>
-                                                </div>
-                                            ) : (
-                                                <p className="text-sm text-[#333333] leading-relaxed whitespace-pre-wrap">
-                                                    {thread.content}
-                                                </p>
-                                            )}
-
-                                            {/* Actions Bar */}
-                                            {editingId !== thread.id && (
-                                                <div className="mt-3 flex items-center gap-4">
-                                                    <button
-                                                        onClick={() => handleReaction(thread.id, '👍')}
-                                                        className="flex items-center gap-1.5 text-xs text-[#666666] hover:text-[#6C63FF] transition-colors"
-                                                    >
-                                                        <ThumbsUp className="size-3.5" />
-                                                        {thread.reactions?.find((r) => r.emoji === '👍')?.userIds.length || ''}
-                                                    </button>
-                                                    <button
-                                                        onClick={() => startReply(thread.id)}
-                                                        className="flex items-center gap-1.5 text-xs text-[#666666] hover:text-[#6C63FF] transition-colors"
-                                                    >
-                                                        <Reply className="size-3.5" />
-                                                        Reply
-                                                    </button>
-                                                    {thread.replies.length > 0 && !expandedReplies.has(thread.id) && (
-                                                        <button
-                                                            onClick={() => setExpandedReplies((prev) => new Set([...prev, thread.id]))}
-                                                            className="text-xs font-medium text-[#6C63FF] hover:text-[#5A52E6] transition-colors"
-                                                        >
-                                                            View {thread.replies.length} {thread.replies.length === 1 ? 'reply' : 'replies'}
-                                                        </button>
-                                                    )}
-                                                </div>
-                                            )}
-                                        </div>
-                                    </div>
-                                </div>
-
-                                {/* Replies */}
-                                <AnimatePresence>
-                                    {expandedReplies.has(thread.id) && thread.replies.length > 0 && (
-                                        <motion.div
-                                            initial={{ opacity: 0, height: 0 }}
-                                            animate={{ opacity: 1, height: 'auto' }}
-                                            exit={{ opacity: 0, height: 0 }}
-                                            className="border-t border-[#E5E7EB] bg-[#FAFAFA]/50"
-                                        >
-                                            <div className="space-y-3 p-4 pl-16">
-                                                {thread.replies.map((reply) => (
-                                                    <div key={reply.id} className="flex gap-3">
-                                                        <div className="flex size-6 shrink-0 items-center justify-center rounded-full bg-[#6C63FF]/10 text-[#6C63FF] text-[10px] font-semibold">
-                                                            {reply.userName.charAt(0).toUpperCase()}
-                                                        </div>
-                                                        <div className="flex-1 min-w-0">
-                                                            <div className="mb-1 flex items-center gap-2">
-                                                                <span className="text-xs font-semibold text-[#333333]">
-                                                                    {reply.userName}
-                                                                </span>
-                                                                <span className="text-[10px] text-[#9CA3AF]">
-                                                                    {formatTime(reply.createdAt)}
-                                                                </span>
-                                                            </div>
-                                                            <p className="text-xs text-[#333333] leading-relaxed">
-                                                                {reply.content}
-                                                            </p>
-                                                        </div>
-                                                    </div>
-                                                ))}
-                                            </div>
-                                        </motion.div>
-                                    )}
-                                </AnimatePresence>
-                            </motion.div>
-                        ))
-                    )}
+                {/* Replies */}
+                <AnimatePresence>
+                  {expandedReplies.has(thread.id) && thread.replies.length > 0 && (
+                    <motion.div
+                      initial={{ opacity: 0, height: 0 }}
+                      animate={{ opacity: 1, height: 'auto' }}
+                      exit={{ opacity: 0, height: 0 }}
+                      className="border-t border-[#E5E7EB] bg-[#FAFAFA]/50"
+                    >
+                      <div className="space-y-3 p-4 pl-16">
+                        {thread.replies.map((reply) => (
+                          <div key={reply.id} className="flex gap-3">
+                            <div className="flex size-6 shrink-0 items-center justify-center rounded-full bg-[#6C63FF]/10 text-[#6C63FF] text-[10px] font-semibold">
+                              {reply.userName.charAt(0).toUpperCase()}
+                            </div>
+                            <div className="flex-1 min-w-0">
+                              <div className="mb-1 flex items-center gap-2">
+                                <span className="text-xs font-semibold text-[#333333]">
+                                  {reply.userName}
+                                </span>
+                                <span className="text-[10px] text-[#9CA3AF]">
+                                  {formatTime(reply.createdAt)}
+                                </span>
+                              </div>
+                              <p className="text-xs text-[#333333] leading-relaxed">
+                                {reply.content}
+                              </p>
+                            </div>
+                          </div>
+                        ))}
+                      </div>
+                    </motion.div>
+                  )}
                 </AnimatePresence>
-            </div>
-        </div>
-    )
+              </motion.div>
+            ))
+          )}
+        </AnimatePresence>
+      </div>
+    </div>
+  )
 }
diff --git a/src/components/filters/DateRangePicker.tsx b/src/components/filters/DateRangePicker.tsx
index 06df053b..db0b0e3a 100644
--- a/src/components/filters/DateRangePicker.tsx
+++ b/src/components/filters/DateRangePicker.tsx
@@ -3,258 +3,283 @@
 import { useState, useCallback, useMemo } from 'react'
 import { motion, AnimatePresence } from 'framer-motion'
 import { Calendar, ChevronLeft, ChevronRight, X } from 'lucide-react'
-import { format, startOfMonth, endOfMonth, eachDayOfInterval, isSameMonth, isSameDay, isWithinInterval, startOfWeek, endOfWeek, addMonths, subMonths } from 'date-fns'
+import {
+  format,
+  startOfMonth,
+  endOfMonth,
+  eachDayOfInterval,
+  isSameMonth,
+  isSameDay,
+  isWithinInterval,
+  startOfWeek,
+  endOfWeek,
+  addMonths,
+  subMonths,
+} from 'date-fns'
 import { cn } from '@/lib/utils'
 import { TimeWindow } from '@/types'
 
 interface DateRangePickerProps {
-    startDate: Date
-    endDate: Date
-    onChange: (range: { start: Date; end: Date }) => void
-    onPresetSelect?: (preset: TimeWindow) => void
-    className?: string
+  startDate: Date
+  endDate: Date
+  onChange: (range: { start: Date; end: Date }) => void
+  onPresetSelect?: (preset: TimeWindow) => void
+  className?: string
 }
 
 const PRESETS = [
-    { label: 'Last 7 days', value: TimeWindow.LAST_7_DAYS, days: 7 },
-    { label: 'Last 30 days', value: TimeWindow.LAST_30_DAYS, days: 30 },
-    { label: 'Last 60 days', value: TimeWindow.LAST_60_DAYS, days: 60 },
-    { label: 'Last 90 days', value: TimeWindow.LAST_90_DAYS, days: 90 },
+  { label: 'Last 7 days', value: TimeWindow.LAST_7_DAYS, days: 7 },
+  { label: 'Last 30 days', value: TimeWindow.LAST_30_DAYS, days: 30 },
+  { label: 'Last 60 days', value: TimeWindow.LAST_60_DAYS, days: 60 },
+  { label: 'Last 90 days', value: TimeWindow.LAST_90_DAYS, days: 90 },
 ]
 
 export default function DateRangePicker({
-    startDate,
-    endDate,
-    onChange,
-    onPresetSelect,
-    className,
+  startDate,
+  endDate,
+  onChange,
+  onPresetSelect,
+  className,
 }: DateRangePickerProps) {
-    const [isOpen, setIsOpen] = useState(false)
-    const [viewDate, setViewDate] = useState(new Date())
-    const [selectingStart, setSelectingStart] = useState(true)
-    const [tempStart, setTempStart] = useState<Date | null>(startDate)
-    const [tempEnd, setTempEnd] = useState<Date | null>(endDate)
+  const [isOpen, setIsOpen] = useState(false)
+  const [viewDate, setViewDate] = useState(new Date())
+  const [selectingStart, setSelectingStart] = useState(true)
+  const [tempStart, setTempStart] = useState<Date | null>(startDate)
+  const [tempEnd, setTempEnd] = useState<Date | null>(endDate)
 
-    const calendarDays = useMemo(() => {
-        const monthStart = startOfMonth(viewDate)
-        const monthEnd = endOfMonth(viewDate)
-        const calendarStart = startOfWeek(monthStart, { weekStartsOn: 0 })
-        const calendarEnd = endOfWeek(monthEnd, { weekStartsOn: 0 })
-        return eachDayOfInterval({ start: calendarStart, end: calendarEnd })
-    }, [viewDate])
+  const calendarDays = useMemo(() => {
+    const monthStart = startOfMonth(viewDate)
+    const monthEnd = endOfMonth(viewDate)
+    const calendarStart = startOfWeek(monthStart, { weekStartsOn: 0 })
+    const calendarEnd = endOfWeek(monthEnd, { weekStartsOn: 0 })
+    return eachDayOfInterval({ start: calendarStart, end: calendarEnd })
+  }, [viewDate])
 
-    const handleDayClick = useCallback((day: Date) => {
-        if (selectingStart) {
-            setTempStart(day)
-            setTempEnd(null)
-            setSelectingStart(false)
+  const handleDayClick = useCallback(
+    (day: Date) => {
+      if (selectingStart) {
+        setTempStart(day)
+        setTempEnd(null)
+        setSelectingStart(false)
+      } else {
+        if (tempStart && day < tempStart) {
+          setTempEnd(tempStart)
+          setTempStart(day)
         } else {
-            if (tempStart && day < tempStart) {
-                setTempEnd(tempStart)
-                setTempStart(day)
-            } else {
-                setTempEnd(day)
-            }
-            setSelectingStart(true)
+          setTempEnd(day)
         }
-    }, [selectingStart, tempStart])
+        setSelectingStart(true)
+      }
+    },
+    [selectingStart, tempStart]
+  )
 
-    const handleApply = useCallback(() => {
-        if (tempStart && tempEnd) {
-            onChange({ start: tempStart, end: tempEnd })
-            setIsOpen(false)
-        }
-    }, [tempStart, tempEnd, onChange])
+  const handleApply = useCallback(() => {
+    if (tempStart && tempEnd) {
+      onChange({ start: tempStart, end: tempEnd })
+      setIsOpen(false)
+    }
+  }, [tempStart, tempEnd, onChange])
 
-    const handlePreset = useCallback((preset: typeof PRESETS[0]) => {
-        const end = new Date()
-        const start = new Date()
-        start.setDate(start.getDate() - preset.days)
-        setTempStart(start)
-        setTempEnd(end)
-        onChange({ start, end })
-        onPresetSelect?.(preset.value)
-        setIsOpen(false)
-    }, [onChange, onPresetSelect])
+  const handlePreset = useCallback(
+    (preset: (typeof PRESETS)[0]) => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - preset.days)
+      setTempStart(start)
+      setTempEnd(end)
+      onChange({ start, end })
+      onPresetSelect?.(preset.value)
+      setIsOpen(false)
+    },
+    [onChange, onPresetSelect]
+  )
 
-    const isInRange = useCallback((day: Date) => {
-        if (!tempStart || !tempEnd) return false
-        return isWithinInterval(day, { start: tempStart, end: tempEnd })
-    }, [tempStart, tempEnd])
+  const isInRange = useCallback(
+    (day: Date) => {
+      if (!tempStart || !tempEnd) return false
+      return isWithinInterval(day, { start: tempStart, end: tempEnd })
+    },
+    [tempStart, tempEnd]
+  )
 
-    const isRangeStart = useCallback((day: Date) => {
-        return tempStart ? isSameDay(day, tempStart) : false
-    }, [tempStart])
+  const isRangeStart = useCallback(
+    (day: Date) => {
+      return tempStart ? isSameDay(day, tempStart) : false
+    },
+    [tempStart]
+  )
 
-    const isRangeEnd = useCallback((day: Date) => {
-        return tempEnd ? isSameDay(day, tempEnd) : false
-    }, [tempEnd])
+  const isRangeEnd = useCallback(
+    (day: Date) => {
+      return tempEnd ? isSameDay(day, tempEnd) : false
+    },
+    [tempEnd]
+  )
 
-    return (
-        <div className={cn('relative', className)}>
-            {/* Trigger Button */}
-            <button
-                type="button"
-                onClick={() => setIsOpen(!isOpen)}
-                className={cn(
-                    'flex items-center gap-2 rounded-lg border border-[#E5E7EB] bg-white px-4 py-2.5 text-sm font-medium text-[#333333] transition-all duration-150',
-                    'hover:border-[#6C63FF] hover:bg-[#F8FAFC]',
-                    'focus:outline-none focus:ring-2 focus:ring-[#6C63FF]/30',
-                    isOpen && 'border-[#6C63FF] ring-2 ring-[#6C63FF]/30'
-                )}
-            >
-                <Calendar className="size-4 text-[#6C63FF]" />
-                <span>
-                    {format(startDate, 'MMM d, yyyy')} – {format(endDate, 'MMM d, yyyy')}
-                </span>
-            </button>
+  return (
+    <div className={cn('relative', className)}>
+      {/* Trigger Button */}
+      <button
+        type="button"
+        onClick={() => setIsOpen(!isOpen)}
+        className={cn(
+          'flex items-center gap-2 rounded-lg border border-[#E5E7EB] bg-white px-4 py-2.5 text-sm font-medium text-[#333333] transition-all duration-150',
+          'hover:border-[#6C63FF] hover:bg-[#F8FAFC]',
+          'focus:outline-none focus:ring-2 focus:ring-[#6C63FF]/30',
+          isOpen && 'border-[#6C63FF] ring-2 ring-[#6C63FF]/30'
+        )}
+      >
+        <Calendar className="size-4 text-[#6C63FF]" />
+        <span>
+          {format(startDate, 'MMM d, yyyy')} – {format(endDate, 'MMM d, yyyy')}
+        </span>
+      </button>
 
-            {/* Dropdown */}
-            <AnimatePresence>
-                {isOpen && (
-                    <>
-                        {/* Backdrop */}
-                        <div
-                            className="fixed inset-0 z-40"
-                            onClick={() => setIsOpen(false)}
-                        />
+      {/* Dropdown */}
+      <AnimatePresence>
+        {isOpen && (
+          <>
+            {/* Backdrop */}
+            <div className="fixed inset-0 z-40" onClick={() => setIsOpen(false)} />
 
-                        <motion.div
-                            initial={{ opacity: 0, y: -10, scale: 0.95 }}
-                            animate={{ opacity: 1, y: 0, scale: 1 }}
-                            exit={{ opacity: 0, y: -10, scale: 0.95 }}
-                            transition={{ duration: 0.15, ease: 'easeOut' }}
-                            className="absolute right-0 top-full z-50 mt-2 w-[360px] rounded-xl border border-[#E5E7EB] bg-white p-4 shadow-xl"
-                        >
-                            {/* Header */}
-                            <div className="mb-4 flex items-center justify-between">
-                                <h3 className="text-sm font-semibold text-[#333333]">Select Date Range</h3>
-                                <button
-                                    onClick={() => setIsOpen(false)}
-                                    className="rounded-lg p-1 text-[#9CA3AF] hover:bg-[#F8FAFC] hover:text-[#333333] transition-colors"
-                                >
-                                    <X className="size-4" />
-                                </button>
-                            </div>
+            <motion.div
+              initial={{ opacity: 0, y: -10, scale: 0.95 }}
+              animate={{ opacity: 1, y: 0, scale: 1 }}
+              exit={{ opacity: 0, y: -10, scale: 0.95 }}
+              transition={{ duration: 0.15, ease: 'easeOut' }}
+              className="absolute right-0 top-full z-50 mt-2 w-[360px] rounded-xl border border-[#E5E7EB] bg-white p-4 shadow-xl"
+            >
+              {/* Header */}
+              <div className="mb-4 flex items-center justify-between">
+                <h3 className="text-sm font-semibold text-[#333333]">Select Date Range</h3>
+                <button
+                  onClick={() => setIsOpen(false)}
+                  className="rounded-lg p-1 text-[#9CA3AF] hover:bg-[#F8FAFC] hover:text-[#333333] transition-colors"
+                >
+                  <X className="size-4" />
+                </button>
+              </div>
 
-                            {/* Presets */}
-                            <div className="mb-4 flex flex-wrap gap-2">
-                                {PRESETS.map((preset) => (
-                                    <button
-                                        key={preset.value}
-                                        onClick={() => handlePreset(preset)}
-                                        className="rounded-md border border-[#E5E7EB] bg-[#FAFAFA] px-3 py-1.5 text-xs font-medium text-[#666666] transition-all hover:border-[#6C63FF] hover:bg-[#6C63FF]/5 hover:text-[#6C63FF]"
-                                    >
-                                        {preset.label}
-                                    </button>
-                                ))}
-                            </div>
+              {/* Presets */}
+              <div className="mb-4 flex flex-wrap gap-2">
+                {PRESETS.map((preset) => (
+                  <button
+                    key={preset.value}
+                    onClick={() => handlePreset(preset)}
+                    className="rounded-md border border-[#E5E7EB] bg-[#FAFAFA] px-3 py-1.5 text-xs font-medium text-[#666666] transition-all hover:border-[#6C63FF] hover:bg-[#6C63FF]/5 hover:text-[#6C63FF]"
+                  >
+                    {preset.label}
+                  </button>
+                ))}
+              </div>
 
-                            {/* Calendar Navigation */}
-                            <div className="mb-3 flex items-center justify-between">
-                                <button
-                                    onClick={() => setViewDate(subMonths(viewDate, 1))}
-                                    className="rounded-lg p-1.5 text-[#666666] hover:bg-[#F8FAFC] hover:text-[#333333] transition-colors"
-                                >
-                                    <ChevronLeft className="size-5" />
-                                </button>
-                                <span className="text-sm font-semibold text-[#333333]">
-                                    {format(viewDate, 'MMMM yyyy')}
-                                </span>
-                                <button
-                                    onClick={() => setViewDate(addMonths(viewDate, 1))}
-                                    className="rounded-lg p-1.5 text-[#666666] hover:bg-[#F8FAFC] hover:text-[#333333] transition-colors"
-                                >
-                                    <ChevronRight className="size-5" />
-                                </button>
-                            </div>
+              {/* Calendar Navigation */}
+              <div className="mb-3 flex items-center justify-between">
+                <button
+                  onClick={() => setViewDate(subMonths(viewDate, 1))}
+                  className="rounded-lg p-1.5 text-[#666666] hover:bg-[#F8FAFC] hover:text-[#333333] transition-colors"
+                >
+                  <ChevronLeft className="size-5" />
+                </button>
+                <span className="text-sm font-semibold text-[#333333]">
+                  {format(viewDate, 'MMMM yyyy')}
+                </span>
+                <button
+                  onClick={() => setViewDate(addMonths(viewDate, 1))}
+                  className="rounded-lg p-1.5 text-[#666666] hover:bg-[#F8FAFC] hover:text-[#333333] transition-colors"
+                >
+                  <ChevronRight className="size-5" />
+                </button>
+              </div>
 
-                            {/* Calendar Grid */}
-                            <div className="mb-4">
-                                {/* Day Headers */}
-                                <div className="mb-1 grid grid-cols-7 gap-1">
-                                    {['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'].map((day) => (
-                                        <div
-                                            key={day}
-                                            className="py-1 text-center text-xs font-medium text-[#9CA3AF]"
-                                        >
-                                            {day}
-                                        </div>
-                                    ))}
-                                </div>
+              {/* Calendar Grid */}
+              <div className="mb-4">
+                {/* Day Headers */}
+                <div className="mb-1 grid grid-cols-7 gap-1">
+                  {['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'].map((day) => (
+                    <div key={day} className="py-1 text-center text-xs font-medium text-[#9CA3AF]">
+                      {day}
+                    </div>
+                  ))}
+                </div>
 
-                                {/* Days */}
-                                <div className="grid grid-cols-7 gap-1">
-                                    {calendarDays.map((day, idx) => {
-                                        const isCurrentMonth = isSameMonth(day, viewDate)
-                                        const isStart = isRangeStart(day)
-                                        const isEnd = isRangeEnd(day)
-                                        const inRange = isInRange(day)
-                                        const isToday = isSameDay(day, new Date())
+                {/* Days */}
+                <div className="grid grid-cols-7 gap-1">
+                  {calendarDays.map((day, idx) => {
+                    const isCurrentMonth = isSameMonth(day, viewDate)
+                    const isStart = isRangeStart(day)
+                    const isEnd = isRangeEnd(day)
+                    const inRange = isInRange(day)
+                    const isToday = isSameDay(day, new Date())
 
-                                        return (
-                                            <button
-                                                key={idx}
-                                                type="button"
-                                                onClick={() => handleDayClick(day)}
-                                                disabled={!isCurrentMonth}
-                                                className={cn(
-                                                    'relative flex h-9 w-full items-center justify-center rounded-lg text-sm font-medium transition-all duration-150',
-                                                    !isCurrentMonth && 'text-[#D1D5DB] cursor-not-allowed',
-                                                    isCurrentMonth && !isStart && !isEnd && !inRange && 'text-[#333333] hover:bg-[#F8FAFC]',
-                                                    inRange && !isStart && !isEnd && 'bg-[#6C63FF]/10 text-[#6C63FF]',
-                                                    (isStart || isEnd) && 'bg-[#6C63FF] text-white',
-                                                    isToday && !isStart && !isEnd && 'ring-1 ring-[#6C63FF]'
-                                                )}
-                                            >
-                                                {format(day, 'd')}
-                                            </button>
-                                        )
-                                    })}
-                                </div>
-                            </div>
+                    return (
+                      <button
+                        key={idx}
+                        type="button"
+                        onClick={() => handleDayClick(day)}
+                        disabled={!isCurrentMonth}
+                        className={cn(
+                          'relative flex h-9 w-full items-center justify-center rounded-lg text-sm font-medium transition-all duration-150',
+                          !isCurrentMonth && 'text-[#D1D5DB] cursor-not-allowed',
+                          isCurrentMonth &&
+                            !isStart &&
+                            !isEnd &&
+                            !inRange &&
+                            'text-[#333333] hover:bg-[#F8FAFC]',
+                          inRange && !isStart && !isEnd && 'bg-[#6C63FF]/10 text-[#6C63FF]',
+                          (isStart || isEnd) && 'bg-[#6C63FF] text-white',
+                          isToday && !isStart && !isEnd && 'ring-1 ring-[#6C63FF]'
+                        )}
+                      >
+                        {format(day, 'd')}
+                      </button>
+                    )
+                  })}
+                </div>
+              </div>
 
-                            {/* Selection Info */}
-                            <div className="mb-4 rounded-lg bg-[#F8FAFC] p-3">
-                                <p className="text-xs text-[#666666]">
-                                    {selectingStart ? 'Select start date' : 'Select end date'}
-                                </p>
-                                <p className="mt-1 text-sm font-medium text-[#333333]">
-                                    {tempStart ? format(tempStart, 'MMM d, yyyy') : '—'}
-                                    {' → '}
-                                    {tempEnd ? format(tempEnd, 'MMM d, yyyy') : '—'}
-                                </p>
-                            </div>
+              {/* Selection Info */}
+              <div className="mb-4 rounded-lg bg-[#F8FAFC] p-3">
+                <p className="text-xs text-[#666666]">
+                  {selectingStart ? 'Select start date' : 'Select end date'}
+                </p>
+                <p className="mt-1 text-sm font-medium text-[#333333]">
+                  {tempStart ? format(tempStart, 'MMM d, yyyy') : '—'}
+                  {' → '}
+                  {tempEnd ? format(tempEnd, 'MMM d, yyyy') : '—'}
+                </p>
+              </div>
 
-                            {/* Actions */}
-                            <div className="flex items-center justify-end gap-2">
-                                <button
-                                    onClick={() => {
-                                        setTempStart(startDate)
-                                        setTempEnd(endDate)
-                                        setIsOpen(false)
-                                    }}
-                                    className="rounded-lg px-4 py-2 text-sm font-medium text-[#666666] hover:bg-[#F8FAFC] transition-colors"
-                                >
-                                    Cancel
-                                </button>
-                                <button
-                                    onClick={handleApply}
-                                    disabled={!tempStart || !tempEnd}
-                                    className={cn(
-                                        'rounded-lg px-4 py-2 text-sm font-semibold text-white transition-all',
-                                        tempStart && tempEnd
-                                            ? 'bg-[#6C63FF] hover:bg-[#5A52E6]'
-                                            : 'bg-[#D1D5DB] cursor-not-allowed'
-                                    )}
-                                >
-                                    Apply Range
-                                </button>
-                            </div>
-                        </motion.div>
-                    </>
-                )}
-            </AnimatePresence>
-        </div>
-    )
+              {/* Actions */}
+              <div className="flex items-center justify-end gap-2">
+                <button
+                  onClick={() => {
+                    setTempStart(startDate)
+                    setTempEnd(endDate)
+                    setIsOpen(false)
+                  }}
+                  className="rounded-lg px-4 py-2 text-sm font-medium text-[#666666] hover:bg-[#F8FAFC] transition-colors"
+                >
+                  Cancel
+                </button>
+                <button
+                  onClick={handleApply}
+                  disabled={!tempStart || !tempEnd}
+                  className={cn(
+                    'rounded-lg px-4 py-2 text-sm font-semibold text-white transition-all',
+                    tempStart && tempEnd
+                      ? 'bg-[#6C63FF] hover:bg-[#5A52E6]'
+                      : 'bg-[#D1D5DB] cursor-not-allowed'
+                  )}
+                >
+                  Apply Range
+                </button>
+              </div>
+            </motion.div>
+          </>
+        )}
+      </AnimatePresence>
+    </div>
+  )
 }
diff --git a/src/components/nav/topbar.tsx b/src/components/nav/topbar.tsx
index 9d1d921c..a7e18faf 100644
--- a/src/components/nav/topbar.tsx
+++ b/src/components/nav/topbar.tsx
@@ -4,6 +4,7 @@ import React from 'react'
 import { Search, Bell, User, Settings as SettingsIcon, Command } from 'lucide-react'
 import { cn } from '@/lib/utils'
 import { Button } from '@/components/ui/button'
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -15,97 +16,114 @@ import {
 
 export function Topbar() {
   return (
-    <header
-      className={cn(
-        'h-16 bg-[var(--background)] border-b border-[var(--border)]',
-        'px-6 flex items-center justify-between',
-        'sticky top-0 z-40 text-[var(--foreground)]'
-      )}
-      role="banner"
-      aria-label="Top navigation"
-    >
-      {/* Left Side - Search */}
-      <div className="flex items-center gap-4 flex-1 max-w-md">
-        <div className="relative flex-1">
-          <Search
-            className="absolute left-3 top-1/2 -translate-y-1/2 size-4 text-neutral-subtle"
-            aria-hidden="true"
-          />
-          <input
-            type="search"
-            placeholder="Search..."
-            className={cn(
-              'w-full pl-10 pr-4 py-2 rounded-md',
-              'bg-[var(--surface)] border border-[var(--border)]',
-              'text-sm text-[var(--foreground)] placeholder:text-neutral-subtle',
-              'focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-primary focus-visible:ring-offset-1',
-              'focus-visible:border-primary focus-visible:bg-[var(--background)] transition-all duration-150'
-            )}
-            aria-label="Search"
-          />
-          <kbd className="absolute right-3 top-1/2 -translate-y-1/2 hidden md:flex items-center gap-1 px-2 py-1 text-xs font-medium text-neutral-medium bg-[var(--surface)] border border-[var(--border)] rounded-md">
-            <Command className="size-3" />
-            <span>K</span>
-          </kbd>
+    <TooltipProvider>
+      <header
+        className={cn(
+          'h-16 bg-[var(--background)] border-b border-[var(--border)]',
+          'px-6 flex items-center justify-between',
+          'sticky top-0 z-40 text-[var(--foreground)]'
+        )}
+        role="banner"
+        aria-label="Top navigation"
+      >
+        {/* Left Side - Search */}
+        <div className="flex items-center gap-4 flex-1 max-w-md">
+          <div className="relative flex-1">
+            <Search
+              className="absolute left-3 top-1/2 -translate-y-1/2 size-4 text-neutral-subtle"
+              aria-hidden="true"
+            />
+            <input
+              type="search"
+              placeholder="Search..."
+              className={cn(
+                'w-full pl-10 pr-4 py-2 rounded-md',
+                'bg-[var(--surface)] border border-[var(--border)]',
+                'text-sm text-[var(--foreground)] placeholder:text-neutral-subtle',
+                'focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-primary focus-visible:ring-offset-1',
+                'focus-visible:border-primary focus-visible:bg-[var(--background)] transition-all duration-150'
+              )}
+              aria-label="Search"
+            />
+            <kbd className="absolute right-3 top-1/2 -translate-y-1/2 hidden md:flex items-center gap-1 px-2 py-1 text-xs font-medium text-neutral-medium bg-[var(--surface)] border border-[var(--border)] rounded-md">
+              <Command className="size-3" />
+              <span>K</span>
+            </kbd>
+          </div>
         </div>
-      </div>
 
-      {/* Right Side - Actions */}
-      <div className="flex items-center gap-2">
-        {/* Notifications */}
-        <Button
-          variant="ghost"
-          size="icon"
-          className="text-neutral-medium hover:text-[var(--foreground)] hover:bg-[var(--surface)] transition-colors duration-150"
-          aria-label="Notifications"
-        >
-          <Bell className="size-4" />
-        </Button>
+        {/* Right Side - Actions */}
+        <div className="flex items-center gap-2">
+          {/* Notifications */}
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <Button
+                variant="ghost"
+                size="icon"
+                className="text-neutral-medium hover:text-[var(--foreground)] hover:bg-[var(--surface)] transition-colors duration-150"
+                aria-label="Notifications"
+              >
+                <Bell className="size-4" />
+              </Button>
+            </TooltipTrigger>
+            <TooltipContent>Notifications</TooltipContent>
+          </Tooltip>
 
-        {/* User Menu */}
-        <DropdownMenu>
-          <DropdownMenuTrigger asChild>
-            <Button
-              variant="ghost"
-              size="icon"
-              className="text-neutral-medium hover:text-[var(--foreground)] hover:bg-[var(--surface)] transition-colors duration-150"
-              aria-label="User menu"
+          {/* User Menu */}
+          <DropdownMenu>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <DropdownMenuTrigger asChild>
+                  <Button
+                    variant="ghost"
+                    size="icon"
+                    className="text-neutral-medium hover:text-[var(--foreground)] hover:bg-[var(--surface)] transition-colors duration-150"
+                    aria-label="User menu"
+                  >
+                    <User className="size-4" />
+                  </Button>
+                </DropdownMenuTrigger>
+              </TooltipTrigger>
+              <TooltipContent>User menu</TooltipContent>
+            </Tooltip>
+            <DropdownMenuContent
+              align="end"
+              className="bg-[var(--background)] border border-[var(--border)] text-[var(--foreground)]"
             >
-              <User className="size-4" />
-            </Button>
-          </DropdownMenuTrigger>
-          <DropdownMenuContent
-            align="end"
-            className="bg-[var(--background)] border border-[var(--border)] text-[var(--foreground)]"
-          >
-            <DropdownMenuLabel className="text-[var(--foreground)]">My Account</DropdownMenuLabel>
-            <DropdownMenuSeparator className="bg-[var(--border)]" />
-            <DropdownMenuItem className="text-[var(--foreground)] hover:bg-[var(--surface)]">
-              Profile
-            </DropdownMenuItem>
-            <DropdownMenuItem className="text-[var(--foreground)] hover:bg-[var(--surface)]">
-              Settings
-            </DropdownMenuItem>
-            <DropdownMenuSeparator className="bg-[var(--border)]" />
-            <DropdownMenuItem className="text-[var(--foreground)] hover:bg-[var(--surface)]">
-              Logout
-            </DropdownMenuItem>
-          </DropdownMenuContent>
-        </DropdownMenu>
+              <DropdownMenuLabel className="text-[var(--foreground)]">My Account</DropdownMenuLabel>
+              <DropdownMenuSeparator className="bg-[var(--border)]" />
+              <DropdownMenuItem className="text-[var(--foreground)] hover:bg-[var(--surface)]">
+                Profile
+              </DropdownMenuItem>
+              <DropdownMenuItem className="text-[var(--foreground)] hover:bg-[var(--surface)]">
+                Settings
+              </DropdownMenuItem>
+              <DropdownMenuSeparator className="bg-[var(--border)]" />
+              <DropdownMenuItem className="text-[var(--foreground)] hover:bg-[var(--surface)]">
+                Logout
+              </DropdownMenuItem>
+            </DropdownMenuContent>
+          </DropdownMenu>
 
-        {/* Settings Link */}
-        <Button
-          variant="ghost"
-          size="icon"
-          className="text-neutral-medium hover:text-[var(--foreground)] hover:bg-[var(--surface)] transition-colors duration-150"
-          aria-label="Settings"
-          asChild
-        >
-          <a href="/settings">
-            <SettingsIcon className="size-4" />
-          </a>
-        </Button>
-      </div>
-    </header>
+          {/* Settings Link */}
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <Button
+                variant="ghost"
+                size="icon"
+                className="text-neutral-medium hover:text-[var(--foreground)] hover:bg-[var(--surface)] transition-colors duration-150"
+                aria-label="Settings"
+                asChild
+              >
+                <a href="/settings">
+                  <SettingsIcon className="size-4" />
+                </a>
+              </Button>
+            </TooltipTrigger>
+            <TooltipContent>Settings</TooltipContent>
+          </Tooltip>
+        </div>
+      </header>
+    </TooltipProvider>
   )
 }
diff --git a/src/components/overlay/modal.tsx b/src/components/overlay/modal.tsx
index b5d9e895..5f67b0e4 100644
--- a/src/components/overlay/modal.tsx
+++ b/src/components/overlay/modal.tsx
@@ -68,4 +68,3 @@ export function Modal({
     </AnimatePresence>
   )
 }
-
diff --git a/src/components/settings/PreferencesButton.tsx b/src/components/settings/PreferencesButton.tsx
index a8c20b53..45a206f2 100644
--- a/src/components/settings/PreferencesButton.tsx
+++ b/src/components/settings/PreferencesButton.tsx
@@ -8,77 +8,77 @@ import { useOptionalUserPreferences, useLocalPreferences } from '@/hooks/useUser
 import { cn } from '@/lib/utils'
 
 interface PreferencesButtonProps {
-    variant?: 'icon' | 'default'
-    className?: string
-    useProvider?: boolean
+  variant?: 'icon' | 'default'
+  className?: string
+  useProvider?: boolean
 }
 
 export default function PreferencesButton({
-    variant = 'icon',
-    className,
-    useProvider = true,
+  variant = 'icon',
+  className,
+  useProvider = true,
 }: PreferencesButtonProps) {
-    const [isOpen, setIsOpen] = useState(false)
+  const [isOpen, setIsOpen] = useState(false)
 
-    // Use provider or standalone hook
-    const providerContext = useOptionalUserPreferences()
-    const localContext = useLocalPreferences()
+  // Use provider or standalone hook
+  const providerContext = useOptionalUserPreferences()
+  const localContext = useLocalPreferences()
 
-    const shouldUseProvider = useProvider && !!providerContext
-    const preferences = shouldUseProvider ? providerContext!.preferences : localContext.preferences
-    const savePreferences = shouldUseProvider
-        ? providerContext!.savePreferences
-        : async (prefs: UserPreferences) => {
-            localContext.updatePreferences(prefs)
-        }
-
-    if (variant === 'icon') {
-        return (
-            <>
-                <motion.button
-                    whileHover={{ scale: 1.05 }}
-                    whileTap={{ scale: 0.95 }}
-                    onClick={() => setIsOpen(true)}
-                    className={cn(
-                        'flex size-10 items-center justify-center rounded-xl border border-[#E5E7EB] bg-white text-[#6B7280] transition-colors hover:border-[#6C63FF] hover:text-[#6C63FF]',
-                        className
-                    )}
-                    aria-label="User Preferences"
-                >
-                    <Settings className="size-5" />
-                </motion.button>
-
-                <UserPreferencesModal
-                    isOpen={isOpen}
-                    onClose={() => setIsOpen(false)}
-                    preferences={preferences}
-                    onSave={savePreferences}
-                />
-            </>
-        )
-    }
+  const shouldUseProvider = useProvider && !!providerContext
+  const preferences = shouldUseProvider ? providerContext!.preferences : localContext.preferences
+  const savePreferences = shouldUseProvider
+    ? providerContext!.savePreferences
+    : async (prefs: UserPreferences) => {
+        localContext.updatePreferences(prefs)
+      }
 
+  if (variant === 'icon') {
     return (
-        <>
-            <motion.button
-                whileHover={{ scale: 1.02 }}
-                whileTap={{ scale: 0.98 }}
-                onClick={() => setIsOpen(true)}
-                className={cn(
-                    'flex items-center gap-2 rounded-xl border border-[#E5E7EB] bg-white px-4 py-2.5 text-sm font-medium text-[#333333] transition-all hover:border-[#6C63FF] hover:shadow-sm',
-                    className
-                )}
-            >
-                <User className="size-4 text-[#6C63FF]" />
-                Preferences
-            </motion.button>
+      <>
+        <motion.button
+          whileHover={{ scale: 1.05 }}
+          whileTap={{ scale: 0.95 }}
+          onClick={() => setIsOpen(true)}
+          className={cn(
+            'flex size-10 items-center justify-center rounded-xl border border-[#E5E7EB] bg-white text-[#6B7280] transition-colors hover:border-[#6C63FF] hover:text-[#6C63FF]',
+            className
+          )}
+          aria-label="User Preferences"
+        >
+          <Settings className="size-5" />
+        </motion.button>
 
-            <UserPreferencesModal
-                isOpen={isOpen}
-                onClose={() => setIsOpen(false)}
-                preferences={preferences}
-                onSave={savePreferences}
-            />
-        </>
+        <UserPreferencesModal
+          isOpen={isOpen}
+          onClose={() => setIsOpen(false)}
+          preferences={preferences}
+          onSave={savePreferences}
+        />
+      </>
     )
+  }
+
+  return (
+    <>
+      <motion.button
+        whileHover={{ scale: 1.02 }}
+        whileTap={{ scale: 0.98 }}
+        onClick={() => setIsOpen(true)}
+        className={cn(
+          'flex items-center gap-2 rounded-xl border border-[#E5E7EB] bg-white px-4 py-2.5 text-sm font-medium text-[#333333] transition-all hover:border-[#6C63FF] hover:shadow-sm',
+          className
+        )}
+      >
+        <User className="size-4 text-[#6C63FF]" />
+        Preferences
+      </motion.button>
+
+      <UserPreferencesModal
+        isOpen={isOpen}
+        onClose={() => setIsOpen(false)}
+        preferences={preferences}
+        onSave={savePreferences}
+      />
+    </>
+  )
 }
diff --git a/src/components/settings/UserPreferencesModal.tsx b/src/components/settings/UserPreferencesModal.tsx
index 09f2a5a9..b19d09cd 100644
--- a/src/components/settings/UserPreferencesModal.tsx
+++ b/src/components/settings/UserPreferencesModal.tsx
@@ -3,24 +3,24 @@
 import { useState, useCallback, useEffect } from 'react'
 import { motion, AnimatePresence } from 'framer-motion'
 import {
-    User,
-    Bell,
-    Palette,
-    Layout,
-    Filter,
-    Save,
-    Loader2,
-    Check,
-    X,
-    Moon,
-    Sun,
-    Monitor,
-    Mail,
-    Smartphone,
-    MessageSquare,
-    BarChart3,
-    Clock,
-    Settings2,
+  User,
+  Bell,
+  Palette,
+  Layout,
+  Filter,
+  Save,
+  Loader2,
+  Check,
+  X,
+  Moon,
+  Sun,
+  Monitor,
+  Mail,
+  Smartphone,
+  MessageSquare,
+  BarChart3,
+  Clock,
+  Settings2,
 } from 'lucide-react'
 import { cn } from '@/lib/utils'
 import { notify } from '@/lib/notify'
@@ -32,67 +32,67 @@ import { TimeWindow, DepartmentName, RiskLevel } from '@/types'
 // ============================================================================
 
 export interface UserPreferences {
-    // Display
-    theme: 'light' | 'dark' | 'system'
-    density: 'comfortable' | 'compact'
-    sidebarCollapsed: boolean
-    showHealthScore: boolean
-    showQuickActions: boolean
-
-    // Notifications
-    emailNotifications: boolean
-    pushNotifications: boolean
-    slackNotifications: boolean
-    notifyOnCritical: boolean
-    notifyOnHigh: boolean
-    notifyOnResolved: boolean
-    digestFrequency: 'realtime' | 'hourly' | 'daily' | 'weekly'
-
-    // Default Filters
-    defaultTimeWindow: TimeWindow
-    defaultDepartments: DepartmentName[]
-    defaultRiskLevels: RiskLevel[]
-    showOnlyUnresolved: boolean
-
-    // Dashboard
-    defaultView: 'overview' | 'departments' | 'events' | 'insights'
-    chartAnimations: boolean
-    autoRefreshInterval: number // in seconds, 0 = disabled
-
-    // Saved at
-    updatedAt?: number
+  // Display
+  theme: 'light' | 'dark' | 'system'
+  density: 'comfortable' | 'compact'
+  sidebarCollapsed: boolean
+  showHealthScore: boolean
+  showQuickActions: boolean
+
+  // Notifications
+  emailNotifications: boolean
+  pushNotifications: boolean
+  slackNotifications: boolean
+  notifyOnCritical: boolean
+  notifyOnHigh: boolean
+  notifyOnResolved: boolean
+  digestFrequency: 'realtime' | 'hourly' | 'daily' | 'weekly'
+
+  // Default Filters
+  defaultTimeWindow: TimeWindow
+  defaultDepartments: DepartmentName[]
+  defaultRiskLevels: RiskLevel[]
+  showOnlyUnresolved: boolean
+
+  // Dashboard
+  defaultView: 'overview' | 'departments' | 'events' | 'insights'
+  chartAnimations: boolean
+  autoRefreshInterval: number // in seconds, 0 = disabled
+
+  // Saved at
+  updatedAt?: number
 }
 
 const DEFAULT_PREFERENCES: UserPreferences = {
-    theme: 'system',
-    density: 'comfortable',
-    sidebarCollapsed: false,
-    showHealthScore: true,
-    showQuickActions: true,
-
-    emailNotifications: true,
-    pushNotifications: false,
-    slackNotifications: true,
-    notifyOnCritical: true,
-    notifyOnHigh: true,
-    notifyOnResolved: false,
-    digestFrequency: 'daily',
-
-    defaultTimeWindow: TimeWindow.LAST_30_DAYS,
-    defaultDepartments: [],
-    defaultRiskLevels: [],
-    showOnlyUnresolved: false,
-
-    defaultView: 'overview',
-    chartAnimations: true,
-    autoRefreshInterval: 0,
+  theme: 'system',
+  density: 'comfortable',
+  sidebarCollapsed: false,
+  showHealthScore: true,
+  showQuickActions: true,
+
+  emailNotifications: true,
+  pushNotifications: false,
+  slackNotifications: true,
+  notifyOnCritical: true,
+  notifyOnHigh: true,
+  notifyOnResolved: false,
+  digestFrequency: 'daily',
+
+  defaultTimeWindow: TimeWindow.LAST_30_DAYS,
+  defaultDepartments: [],
+  defaultRiskLevels: [],
+  showOnlyUnresolved: false,
+
+  defaultView: 'overview',
+  chartAnimations: true,
+  autoRefreshInterval: 0,
 }
 
 interface UserPreferencesModalProps {
-    isOpen: boolean
-    onClose: () => void
-    preferences: UserPreferences
-    onSave: (preferences: UserPreferences) => Promise<void>
+  isOpen: boolean
+  onClose: () => void
+  preferences: UserPreferences
+  onSave: (preferences: UserPreferences) => Promise<void>
 }
 
 // ============================================================================
@@ -100,531 +100,572 @@ interface UserPreferencesModalProps {
 // ============================================================================
 
 export default function UserPreferencesModal({
-    isOpen,
-    onClose,
-    preferences,
-    onSave,
+  isOpen,
+  onClose,
+  preferences,
+  onSave,
 }: UserPreferencesModalProps) {
-    const { trigger } = useHaptic()
-    const [localPrefs, setLocalPrefs] = useState<UserPreferences>(preferences)
-    const [isSaving, setIsSaving] = useState(false)
-    const [activeTab, setActiveTab] = useState<'display' | 'notifications' | 'filters' | 'dashboard'>('display')
-    const [hasChanges, setHasChanges] = useState(false)
-
-    // Track changes
-    useEffect(() => {
-        setHasChanges(JSON.stringify(localPrefs) !== JSON.stringify(preferences))
-    }, [localPrefs, preferences])
-
-    // Reset on close
-    useEffect(() => {
-        if (!isOpen) {
-            setLocalPrefs(preferences)
-            setActiveTab('display')
-        }
-    }, [isOpen, preferences])
-
-    const updatePref = useCallback(<K extends keyof UserPreferences>(key: K, value: UserPreferences[K]) => {
-        setLocalPrefs((prev) => ({ ...prev, [key]: value }))
-        trigger('light')
-    }, [trigger])
-
-    const handleSave = async () => {
-        setIsSaving(true)
-        trigger('light')
-
-        try {
-            await onSave({ ...localPrefs, updatedAt: Date.now() })
-            trigger('success')
-            notify.success('Preferences saved')
-            onClose()
-        } catch (error) {
-            trigger('error')
-            notify.error(error instanceof Error ? error.message : 'Failed to save preferences')
-        } finally {
-            setIsSaving(false)
-        }
+  const { trigger } = useHaptic()
+  const [localPrefs, setLocalPrefs] = useState<UserPreferences>(preferences)
+  const [isSaving, setIsSaving] = useState(false)
+  const [activeTab, setActiveTab] = useState<'display' | 'notifications' | 'filters' | 'dashboard'>(
+    'display'
+  )
+  const [hasChanges, setHasChanges] = useState(false)
+
+  // Track changes
+  useEffect(() => {
+    setHasChanges(JSON.stringify(localPrefs) !== JSON.stringify(preferences))
+  }, [localPrefs, preferences])
+
+  // Reset on close
+  useEffect(() => {
+    if (!isOpen) {
+      setLocalPrefs(preferences)
+      setActiveTab('display')
     }
-
-    const resetToDefaults = () => {
-        setLocalPrefs(DEFAULT_PREFERENCES)
-        trigger('light')
-        notify.info('Reset to defaults')
+  }, [isOpen, preferences])
+
+  const updatePref = useCallback(
+    <K extends keyof UserPreferences>(key: K, value: UserPreferences[K]) => {
+      setLocalPrefs((prev) => ({ ...prev, [key]: value }))
+      trigger('light')
+    },
+    [trigger]
+  )
+
+  const handleSave = async () => {
+    setIsSaving(true)
+    trigger('light')
+
+    try {
+      await onSave({ ...localPrefs, updatedAt: Date.now() })
+      trigger('success')
+      notify.success('Preferences saved')
+      onClose()
+    } catch (error) {
+      trigger('error')
+      notify.error(error instanceof Error ? error.message : 'Failed to save preferences')
+    } finally {
+      setIsSaving(false)
     }
+  }
+
+  const resetToDefaults = () => {
+    setLocalPrefs(DEFAULT_PREFERENCES)
+    trigger('light')
+    notify.info('Reset to defaults')
+  }
+
+  const tabs = [
+    { id: 'display', label: 'Display', icon: Palette },
+    { id: 'notifications', label: 'Notifications', icon: Bell },
+    { id: 'filters', label: 'Filters', icon: Filter },
+    { id: 'dashboard', label: 'Dashboard', icon: Layout },
+  ] as const
+
+  if (!isOpen) return null
+
+  return (
+    <AnimatePresence>
+      {isOpen && (
+        <>
+          {/* Backdrop */}
+          <motion.div
+            initial={{ opacity: 0 }}
+            animate={{ opacity: 1 }}
+            exit={{ opacity: 0 }}
+            onClick={onClose}
+            className="fixed inset-0 z-50 bg-black/50 backdrop-blur-sm"
+          />
+
+          {/* Modal */}
+          <motion.div
+            initial={{ opacity: 0, scale: 0.95, y: 20 }}
+            animate={{ opacity: 1, scale: 1, y: 0 }}
+            exit={{ opacity: 0, scale: 0.95, y: 20 }}
+            transition={{ type: 'spring', damping: 25, stiffness: 300 }}
+            className="fixed left-1/2 top-1/2 z-50 w-full max-w-2xl -translate-x-1/2 -translate-y-1/2"
+          >
+            <div className="rounded-2xl border border-[#E5E7EB] bg-white shadow-2xl">
+              {/* Header */}
+              <div className="flex items-center justify-between border-b border-[#E5E7EB] px-6 py-4">
+                <div className="flex items-center gap-3">
+                  <div className="flex size-10 items-center justify-center rounded-xl bg-[#6C63FF]/10">
+                    <User className="size-5 text-[#6C63FF]" />
+                  </div>
+                  <div>
+                    <h2 className="text-lg font-bold text-[#111827]">User Preferences</h2>
+                    <p className="text-sm text-[#6B7280]">Customize your FluxLens experience</p>
+                  </div>
+                </div>
+                <button
+                  onClick={onClose}
+                  className="rounded-lg p-2 text-[#9CA3AF] hover:bg-[#F3F4F6] hover:text-[#111827] transition-colors"
+                >
+                  <X className="size-5" />
+                </button>
+              </div>
+
+              {/* Tabs */}
+              <div className="flex border-b border-[#E5E7EB] px-6">
+                {tabs.map((tab) => (
+                  <button
+                    key={tab.id}
+                    onClick={() => setActiveTab(tab.id)}
+                    className={cn(
+                      'flex items-center gap-2 border-b-2 px-4 py-3 text-sm font-medium transition-colors',
+                      activeTab === tab.id
+                        ? 'border-[#6C63FF] text-[#6C63FF]'
+                        : 'border-transparent text-[#6B7280] hover:text-[#111827]'
+                    )}
+                  >
+                    <tab.icon className="size-4" />
+                    {tab.label}
+                  </button>
+                ))}
+              </div>
+
+              {/* Content */}
+              <div className="max-h-[400px] overflow-y-auto p-6">
+                <AnimatePresence mode="wait">
+                  {activeTab === 'display' && (
+                    <motion.div
+                      key="display"
+                      initial={{ opacity: 0, x: -10 }}
+                      animate={{ opacity: 1, x: 0 }}
+                      exit={{ opacity: 0, x: 10 }}
+                      className="space-y-6"
+                    >
+                      {/* Theme */}
+                      <div>
+                        <label className="mb-3 block text-sm font-semibold text-[#111827]">
+                          Theme
+                        </label>
+                        <div className="flex gap-3">
+                          {[
+                            { value: 'light', icon: Sun, label: 'Light' },
+                            { value: 'dark', icon: Moon, label: 'Dark' },
+                            { value: 'system', icon: Monitor, label: 'System' },
+                          ].map((option) => (
+                            <button
+                              key={option.value}
+                              onClick={() =>
+                                updatePref('theme', option.value as UserPreferences['theme'])
+                              }
+                              className={cn(
+                                'flex flex-1 items-center justify-center gap-2 rounded-xl border-2 px-4 py-3 text-sm font-medium transition-all',
+                                localPrefs.theme === option.value
+                                  ? 'border-[#6C63FF] bg-[#6C63FF]/5 text-[#6C63FF]'
+                                  : 'border-[#E5E7EB] text-[#6B7280] hover:border-[#D1D5DB]'
+                              )}
+                            >
+                              <option.icon className="size-4" />
+                              {option.label}
+                            </button>
+                          ))}
+                        </div>
+                      </div>
+
+                      {/* Density */}
+                      <div>
+                        <label className="mb-3 block text-sm font-semibold text-[#111827]">
+                          Display Density
+                        </label>
+                        <div className="flex gap-3">
+                          {[
+                            { value: 'comfortable', label: 'Comfortable' },
+                            { value: 'compact', label: 'Compact' },
+                          ].map((option) => (
+                            <button
+                              key={option.value}
+                              onClick={() =>
+                                updatePref('density', option.value as UserPreferences['density'])
+                              }
+                              className={cn(
+                                'flex-1 rounded-xl border-2 px-4 py-3 text-sm font-medium transition-all',
+                                localPrefs.density === option.value
+                                  ? 'border-[#6C63FF] bg-[#6C63FF]/5 text-[#6C63FF]'
+                                  : 'border-[#E5E7EB] text-[#6B7280] hover:border-[#D1D5DB]'
+                              )}
+                            >
+                              {option.label}
+                            </button>
+                          ))}
+                        </div>
+                      </div>
+
+                      {/* Toggles */}
+                      <div className="space-y-3">
+                        <ToggleRow
+                          label="Show Health Score Card"
+                          description="Display the main health score on dashboard"
+                          checked={localPrefs.showHealthScore}
+                          onChange={(v) => updatePref('showHealthScore', v)}
+                        />
+                        <ToggleRow
+                          label="Show Quick Actions"
+                          description="Display action buttons in the header"
+                          checked={localPrefs.showQuickActions}
+                          onChange={(v) => updatePref('showQuickActions', v)}
+                        />
+                        <ToggleRow
+                          label="Collapse Sidebar by Default"
+                          description="Start with a minimized sidebar"
+                          checked={localPrefs.sidebarCollapsed}
+                          onChange={(v) => updatePref('sidebarCollapsed', v)}
+                        />
+                      </div>
+                    </motion.div>
+                  )}
 
-    const tabs = [
-        { id: 'display', label: 'Display', icon: Palette },
-        { id: 'notifications', label: 'Notifications', icon: Bell },
-        { id: 'filters', label: 'Filters', icon: Filter },
-        { id: 'dashboard', label: 'Dashboard', icon: Layout },
-    ] as const
-
-    if (!isOpen) return null
+                  {activeTab === 'notifications' && (
+                    <motion.div
+                      key="notifications"
+                      initial={{ opacity: 0, x: -10 }}
+                      animate={{ opacity: 1, x: 0 }}
+                      exit={{ opacity: 0, x: 10 }}
+                      className="space-y-6"
+                    >
+                      {/* Channels */}
+                      <div>
+                        <label className="mb-3 block text-sm font-semibold text-[#111827]">
+                          Notification Channels
+                        </label>
+                        <div className="space-y-3">
+                          <ToggleRow
+                            label="Email Notifications"
+                            description="Receive updates via email"
+                            icon={Mail}
+                            checked={localPrefs.emailNotifications}
+                            onChange={(v) => updatePref('emailNotifications', v)}
+                          />
+                          <ToggleRow
+                            label="Push Notifications"
+                            description="Browser push notifications"
+                            icon={Smartphone}
+                            checked={localPrefs.pushNotifications}
+                            onChange={(v) => updatePref('pushNotifications', v)}
+                          />
+                          <ToggleRow
+                            label="Slack Notifications"
+                            description="Send to your connected Slack"
+                            icon={MessageSquare}
+                            checked={localPrefs.slackNotifications}
+                            onChange={(v) => updatePref('slackNotifications', v)}
+                          />
+                        </div>
+                      </div>
+
+                      {/* Alert Types */}
+                      <div>
+                        <label className="mb-3 block text-sm font-semibold text-[#111827]">
+                          Alert Types
+                        </label>
+                        <div className="space-y-3">
+                          <ToggleRow
+                            label="Critical Alerts"
+                            description="Immediate notification for critical events"
+                            checked={localPrefs.notifyOnCritical}
+                            onChange={(v) => updatePref('notifyOnCritical', v)}
+                          />
+                          <ToggleRow
+                            label="High Priority Alerts"
+                            description="Notify for high priority events"
+                            checked={localPrefs.notifyOnHigh}
+                            onChange={(v) => updatePref('notifyOnHigh', v)}
+                          />
+                          <ToggleRow
+                            label="Resolution Updates"
+                            description="Notify when events are resolved"
+                            checked={localPrefs.notifyOnResolved}
+                            onChange={(v) => updatePref('notifyOnResolved', v)}
+                          />
+                        </div>
+                      </div>
+
+                      {/* Digest Frequency */}
+                      <div>
+                        <label className="mb-3 block text-sm font-semibold text-[#111827]">
+                          Digest Frequency
+                        </label>
+                        <div className="grid grid-cols-4 gap-2">
+                          {[
+                            { value: 'realtime', label: 'Real-time' },
+                            { value: 'hourly', label: 'Hourly' },
+                            { value: 'daily', label: 'Daily' },
+                            { value: 'weekly', label: 'Weekly' },
+                          ].map((option) => (
+                            <button
+                              key={option.value}
+                              onClick={() =>
+                                updatePref(
+                                  'digestFrequency',
+                                  option.value as UserPreferences['digestFrequency']
+                                )
+                              }
+                              className={cn(
+                                'rounded-lg border-2 px-3 py-2 text-xs font-medium transition-all',
+                                localPrefs.digestFrequency === option.value
+                                  ? 'border-[#6C63FF] bg-[#6C63FF]/5 text-[#6C63FF]'
+                                  : 'border-[#E5E7EB] text-[#6B7280] hover:border-[#D1D5DB]'
+                              )}
+                            >
+                              {option.label}
+                            </button>
+                          ))}
+                        </div>
+                      </div>
+                    </motion.div>
+                  )}
 
-    return (
-        <AnimatePresence>
-            {isOpen && (
-                <>
-                    {/* Backdrop */}
+                  {activeTab === 'filters' && (
                     <motion.div
-                        initial={{ opacity: 0 }}
-                        animate={{ opacity: 1 }}
-                        exit={{ opacity: 0 }}
-                        onClick={onClose}
-                        className="fixed inset-0 z-50 bg-black/50 backdrop-blur-sm"
-                    />
-
-                    {/* Modal */}
+                      key="filters"
+                      initial={{ opacity: 0, x: -10 }}
+                      animate={{ opacity: 1, x: 0 }}
+                      exit={{ opacity: 0, x: 10 }}
+                      className="space-y-6"
+                    >
+                      {/* Default Time Window */}
+                      <div>
+                        <label className="mb-3 block text-sm font-semibold text-[#111827]">
+                          Default Time Window
+                        </label>
+                        <div className="grid grid-cols-4 gap-2">
+                          {[
+                            { value: TimeWindow.LAST_7_DAYS, label: '7 days' },
+                            { value: TimeWindow.LAST_30_DAYS, label: '30 days' },
+                            { value: TimeWindow.LAST_60_DAYS, label: '60 days' },
+                            { value: TimeWindow.LAST_90_DAYS, label: '90 days' },
+                          ].map((option) => (
+                            <button
+                              key={option.value}
+                              onClick={() => updatePref('defaultTimeWindow', option.value)}
+                              className={cn(
+                                'rounded-lg border-2 px-3 py-2 text-xs font-medium transition-all',
+                                localPrefs.defaultTimeWindow === option.value
+                                  ? 'border-[#6C63FF] bg-[#6C63FF]/5 text-[#6C63FF]'
+                                  : 'border-[#E5E7EB] text-[#6B7280] hover:border-[#D1D5DB]'
+                              )}
+                            >
+                              {option.label}
+                            </button>
+                          ))}
+                        </div>
+                      </div>
+
+                      {/* Default Departments */}
+                      <div>
+                        <label className="mb-3 block text-sm font-semibold text-[#111827]">
+                          Default Departments
+                        </label>
+                        <div className="flex flex-wrap gap-2">
+                          {Object.values(DepartmentName).map((dept) => {
+                            const isSelected = localPrefs.defaultDepartments.includes(dept)
+                            return (
+                              <button
+                                key={dept}
+                                onClick={() => {
+                                  const newDepts = isSelected
+                                    ? localPrefs.defaultDepartments.filter((d) => d !== dept)
+                                    : [...localPrefs.defaultDepartments, dept]
+                                  updatePref('defaultDepartments', newDepts)
+                                }}
+                                className={cn(
+                                  'rounded-lg border px-3 py-1.5 text-xs font-medium transition-all',
+                                  isSelected
+                                    ? 'border-[#6C63FF] bg-[#6C63FF] text-white'
+                                    : 'border-[#E5E7EB] text-[#6B7280] hover:border-[#6C63FF] hover:text-[#6C63FF]'
+                                )}
+                              >
+                                {dept}
+                              </button>
+                            )
+                          })}
+                        </div>
+                        <p className="mt-2 text-xs text-[#9CA3AF]">
+                          Leave empty to show all departments
+                        </p>
+                      </div>
+
+                      {/* Default Risk Levels */}
+                      <div>
+                        <label className="mb-3 block text-sm font-semibold text-[#111827]">
+                          Default Risk Levels
+                        </label>
+                        <div className="flex flex-wrap gap-2">
+                          {Object.values(RiskLevel).map((risk) => {
+                            const isSelected = localPrefs.defaultRiskLevels.includes(risk)
+                            const colorMap: Record<string, string> = {
+                              [RiskLevel.CRITICAL]: '#EF4444',
+                              [RiskLevel.HIGH]: '#F59E0B',
+                              [RiskLevel.MODERATE]: '#F59E0B',
+                              [RiskLevel.LOW]: '#10B981',
+                            }
+                            return (
+                              <button
+                                key={risk}
+                                onClick={() => {
+                                  const newRisks = isSelected
+                                    ? localPrefs.defaultRiskLevels.filter((r) => r !== risk)
+                                    : [...localPrefs.defaultRiskLevels, risk]
+                                  updatePref('defaultRiskLevels', newRisks)
+                                }}
+                                className={cn(
+                                  'rounded-lg border px-3 py-1.5 text-xs font-medium capitalize transition-all',
+                                  isSelected
+                                    ? 'border-transparent text-white'
+                                    : 'border-[#E5E7EB] hover:border-current'
+                                )}
+                                style={{
+                                  backgroundColor: isSelected ? colorMap[risk] : undefined,
+                                  color: isSelected ? '#FFFFFF' : colorMap[risk],
+                                }}
+                              >
+                                {risk}
+                              </button>
+                            )
+                          })}
+                        </div>
+                        <p className="mt-2 text-xs text-[#9CA3AF]">
+                          Leave empty to show all risk levels
+                        </p>
+                      </div>
+
+                      <ToggleRow
+                        label="Show Only Unresolved"
+                        description="Filter to unresolved events by default"
+                        checked={localPrefs.showOnlyUnresolved}
+                        onChange={(v) => updatePref('showOnlyUnresolved', v)}
+                      />
+                    </motion.div>
+                  )}
+
+                  {activeTab === 'dashboard' && (
                     <motion.div
-                        initial={{ opacity: 0, scale: 0.95, y: 20 }}
-                        animate={{ opacity: 1, scale: 1, y: 0 }}
-                        exit={{ opacity: 0, scale: 0.95, y: 20 }}
-                        transition={{ type: 'spring', damping: 25, stiffness: 300 }}
-                        className="fixed left-1/2 top-1/2 z-50 w-full max-w-2xl -translate-x-1/2 -translate-y-1/2"
+                      key="dashboard"
+                      initial={{ opacity: 0, x: -10 }}
+                      animate={{ opacity: 1, x: 0 }}
+                      exit={{ opacity: 0, x: 10 }}
+                      className="space-y-6"
                     >
-                        <div className="rounded-2xl border border-[#E5E7EB] bg-white shadow-2xl">
-                            {/* Header */}
-                            <div className="flex items-center justify-between border-b border-[#E5E7EB] px-6 py-4">
-                                <div className="flex items-center gap-3">
-                                    <div className="flex size-10 items-center justify-center rounded-xl bg-[#6C63FF]/10">
-                                        <User className="size-5 text-[#6C63FF]" />
-                                    </div>
-                                    <div>
-                                        <h2 className="text-lg font-bold text-[#111827]">User Preferences</h2>
-                                        <p className="text-sm text-[#6B7280]">Customize your FluxLens experience</p>
-                                    </div>
-                                </div>
-                                <button
-                                    onClick={onClose}
-                                    className="rounded-lg p-2 text-[#9CA3AF] hover:bg-[#F3F4F6] hover:text-[#111827] transition-colors"
-                                >
-                                    <X className="size-5" />
-                                </button>
-                            </div>
-
-                            {/* Tabs */}
-                            <div className="flex border-b border-[#E5E7EB] px-6">
-                                {tabs.map((tab) => (
-                                    <button
-                                        key={tab.id}
-                                        onClick={() => setActiveTab(tab.id)}
-                                        className={cn(
-                                            'flex items-center gap-2 border-b-2 px-4 py-3 text-sm font-medium transition-colors',
-                                            activeTab === tab.id
-                                                ? 'border-[#6C63FF] text-[#6C63FF]'
-                                                : 'border-transparent text-[#6B7280] hover:text-[#111827]'
-                                        )}
-                                    >
-                                        <tab.icon className="size-4" />
-                                        {tab.label}
-                                    </button>
-                                ))}
-                            </div>
-
-                            {/* Content */}
-                            <div className="max-h-[400px] overflow-y-auto p-6">
-                                <AnimatePresence mode="wait">
-                                    {activeTab === 'display' && (
-                                        <motion.div
-                                            key="display"
-                                            initial={{ opacity: 0, x: -10 }}
-                                            animate={{ opacity: 1, x: 0 }}
-                                            exit={{ opacity: 0, x: 10 }}
-                                            className="space-y-6"
-                                        >
-                                            {/* Theme */}
-                                            <div>
-                                                <label className="mb-3 block text-sm font-semibold text-[#111827]">Theme</label>
-                                                <div className="flex gap-3">
-                                                    {[
-                                                        { value: 'light', icon: Sun, label: 'Light' },
-                                                        { value: 'dark', icon: Moon, label: 'Dark' },
-                                                        { value: 'system', icon: Monitor, label: 'System' },
-                                                    ].map((option) => (
-                                                        <button
-                                                            key={option.value}
-                                                            onClick={() => updatePref('theme', option.value as UserPreferences['theme'])}
-                                                            className={cn(
-                                                                'flex flex-1 items-center justify-center gap-2 rounded-xl border-2 px-4 py-3 text-sm font-medium transition-all',
-                                                                localPrefs.theme === option.value
-                                                                    ? 'border-[#6C63FF] bg-[#6C63FF]/5 text-[#6C63FF]'
-                                                                    : 'border-[#E5E7EB] text-[#6B7280] hover:border-[#D1D5DB]'
-                                                            )}
-                                                        >
-                                                            <option.icon className="size-4" />
-                                                            {option.label}
-                                                        </button>
-                                                    ))}
-                                                </div>
-                                            </div>
-
-                                            {/* Density */}
-                                            <div>
-                                                <label className="mb-3 block text-sm font-semibold text-[#111827]">Display Density</label>
-                                                <div className="flex gap-3">
-                                                    {[
-                                                        { value: 'comfortable', label: 'Comfortable' },
-                                                        { value: 'compact', label: 'Compact' },
-                                                    ].map((option) => (
-                                                        <button
-                                                            key={option.value}
-                                                            onClick={() => updatePref('density', option.value as UserPreferences['density'])}
-                                                            className={cn(
-                                                                'flex-1 rounded-xl border-2 px-4 py-3 text-sm font-medium transition-all',
-                                                                localPrefs.density === option.value
-                                                                    ? 'border-[#6C63FF] bg-[#6C63FF]/5 text-[#6C63FF]'
-                                                                    : 'border-[#E5E7EB] text-[#6B7280] hover:border-[#D1D5DB]'
-                                                            )}
-                                                        >
-                                                            {option.label}
-                                                        </button>
-                                                    ))}
-                                                </div>
-                                            </div>
-
-                                            {/* Toggles */}
-                                            <div className="space-y-3">
-                                                <ToggleRow
-                                                    label="Show Health Score Card"
-                                                    description="Display the main health score on dashboard"
-                                                    checked={localPrefs.showHealthScore}
-                                                    onChange={(v) => updatePref('showHealthScore', v)}
-                                                />
-                                                <ToggleRow
-                                                    label="Show Quick Actions"
-                                                    description="Display action buttons in the header"
-                                                    checked={localPrefs.showQuickActions}
-                                                    onChange={(v) => updatePref('showQuickActions', v)}
-                                                />
-                                                <ToggleRow
-                                                    label="Collapse Sidebar by Default"
-                                                    description="Start with a minimized sidebar"
-                                                    checked={localPrefs.sidebarCollapsed}
-                                                    onChange={(v) => updatePref('sidebarCollapsed', v)}
-                                                />
-                                            </div>
-                                        </motion.div>
-                                    )}
-
-                                    {activeTab === 'notifications' && (
-                                        <motion.div
-                                            key="notifications"
-                                            initial={{ opacity: 0, x: -10 }}
-                                            animate={{ opacity: 1, x: 0 }}
-                                            exit={{ opacity: 0, x: 10 }}
-                                            className="space-y-6"
-                                        >
-                                            {/* Channels */}
-                                            <div>
-                                                <label className="mb-3 block text-sm font-semibold text-[#111827]">Notification Channels</label>
-                                                <div className="space-y-3">
-                                                    <ToggleRow
-                                                        label="Email Notifications"
-                                                        description="Receive updates via email"
-                                                        icon={Mail}
-                                                        checked={localPrefs.emailNotifications}
-                                                        onChange={(v) => updatePref('emailNotifications', v)}
-                                                    />
-                                                    <ToggleRow
-                                                        label="Push Notifications"
-                                                        description="Browser push notifications"
-                                                        icon={Smartphone}
-                                                        checked={localPrefs.pushNotifications}
-                                                        onChange={(v) => updatePref('pushNotifications', v)}
-                                                    />
-                                                    <ToggleRow
-                                                        label="Slack Notifications"
-                                                        description="Send to your connected Slack"
-                                                        icon={MessageSquare}
-                                                        checked={localPrefs.slackNotifications}
-                                                        onChange={(v) => updatePref('slackNotifications', v)}
-                                                    />
-                                                </div>
-                                            </div>
-
-                                            {/* Alert Types */}
-                                            <div>
-                                                <label className="mb-3 block text-sm font-semibold text-[#111827]">Alert Types</label>
-                                                <div className="space-y-3">
-                                                    <ToggleRow
-                                                        label="Critical Alerts"
-                                                        description="Immediate notification for critical events"
-                                                        checked={localPrefs.notifyOnCritical}
-                                                        onChange={(v) => updatePref('notifyOnCritical', v)}
-                                                    />
-                                                    <ToggleRow
-                                                        label="High Priority Alerts"
-                                                        description="Notify for high priority events"
-                                                        checked={localPrefs.notifyOnHigh}
-                                                        onChange={(v) => updatePref('notifyOnHigh', v)}
-                                                    />
-                                                    <ToggleRow
-                                                        label="Resolution Updates"
-                                                        description="Notify when events are resolved"
-                                                        checked={localPrefs.notifyOnResolved}
-                                                        onChange={(v) => updatePref('notifyOnResolved', v)}
-                                                    />
-                                                </div>
-                                            </div>
-
-                                            {/* Digest Frequency */}
-                                            <div>
-                                                <label className="mb-3 block text-sm font-semibold text-[#111827]">Digest Frequency</label>
-                                                <div className="grid grid-cols-4 gap-2">
-                                                    {[
-                                                        { value: 'realtime', label: 'Real-time' },
-                                                        { value: 'hourly', label: 'Hourly' },
-                                                        { value: 'daily', label: 'Daily' },
-                                                        { value: 'weekly', label: 'Weekly' },
-                                                    ].map((option) => (
-                                                        <button
-                                                            key={option.value}
-                                                            onClick={() => updatePref('digestFrequency', option.value as UserPreferences['digestFrequency'])}
-                                                            className={cn(
-                                                                'rounded-lg border-2 px-3 py-2 text-xs font-medium transition-all',
-                                                                localPrefs.digestFrequency === option.value
-                                                                    ? 'border-[#6C63FF] bg-[#6C63FF]/5 text-[#6C63FF]'
-                                                                    : 'border-[#E5E7EB] text-[#6B7280] hover:border-[#D1D5DB]'
-                                                            )}
-                                                        >
-                                                            {option.label}
-                                                        </button>
-                                                    ))}
-                                                </div>
-                                            </div>
-                                        </motion.div>
-                                    )}
-
-                                    {activeTab === 'filters' && (
-                                        <motion.div
-                                            key="filters"
-                                            initial={{ opacity: 0, x: -10 }}
-                                            animate={{ opacity: 1, x: 0 }}
-                                            exit={{ opacity: 0, x: 10 }}
-                                            className="space-y-6"
-                                        >
-                                            {/* Default Time Window */}
-                                            <div>
-                                                <label className="mb-3 block text-sm font-semibold text-[#111827]">Default Time Window</label>
-                                                <div className="grid grid-cols-4 gap-2">
-                                                    {[
-                                                        { value: TimeWindow.LAST_7_DAYS, label: '7 days' },
-                                                        { value: TimeWindow.LAST_30_DAYS, label: '30 days' },
-                                                        { value: TimeWindow.LAST_60_DAYS, label: '60 days' },
-                                                        { value: TimeWindow.LAST_90_DAYS, label: '90 days' },
-                                                    ].map((option) => (
-                                                        <button
-                                                            key={option.value}
-                                                            onClick={() => updatePref('defaultTimeWindow', option.value)}
-                                                            className={cn(
-                                                                'rounded-lg border-2 px-3 py-2 text-xs font-medium transition-all',
-                                                                localPrefs.defaultTimeWindow === option.value
-                                                                    ? 'border-[#6C63FF] bg-[#6C63FF]/5 text-[#6C63FF]'
-                                                                    : 'border-[#E5E7EB] text-[#6B7280] hover:border-[#D1D5DB]'
-                                                            )}
-                                                        >
-                                                            {option.label}
-                                                        </button>
-                                                    ))}
-                                                </div>
-                                            </div>
-
-                                            {/* Default Departments */}
-                                            <div>
-                                                <label className="mb-3 block text-sm font-semibold text-[#111827]">Default Departments</label>
-                                                <div className="flex flex-wrap gap-2">
-                                                    {Object.values(DepartmentName).map((dept) => {
-                                                        const isSelected = localPrefs.defaultDepartments.includes(dept)
-                                                        return (
-                                                            <button
-                                                                key={dept}
-                                                                onClick={() => {
-                                                                    const newDepts = isSelected
-                                                                        ? localPrefs.defaultDepartments.filter((d) => d !== dept)
-                                                                        : [...localPrefs.defaultDepartments, dept]
-                                                                    updatePref('defaultDepartments', newDepts)
-                                                                }}
-                                                                className={cn(
-                                                                    'rounded-lg border px-3 py-1.5 text-xs font-medium transition-all',
-                                                                    isSelected
-                                                                        ? 'border-[#6C63FF] bg-[#6C63FF] text-white'
-                                                                        : 'border-[#E5E7EB] text-[#6B7280] hover:border-[#6C63FF] hover:text-[#6C63FF]'
-                                                                )}
-                                                            >
-                                                                {dept}
-                                                            </button>
-                                                        )
-                                                    })}
-                                                </div>
-                                                <p className="mt-2 text-xs text-[#9CA3AF]">Leave empty to show all departments</p>
-                                            </div>
-
-                                            {/* Default Risk Levels */}
-                                            <div>
-                                                <label className="mb-3 block text-sm font-semibold text-[#111827]">Default Risk Levels</label>
-                                                <div className="flex flex-wrap gap-2">
-                                                    {Object.values(RiskLevel).map((risk) => {
-                                                        const isSelected = localPrefs.defaultRiskLevels.includes(risk)
-                                                        const colorMap: Record<string, string> = {
-                                                            [RiskLevel.CRITICAL]: '#EF4444',
-                                                            [RiskLevel.HIGH]: '#F59E0B',
-                                                            [RiskLevel.MODERATE]: '#F59E0B',
-                                                            [RiskLevel.LOW]: '#10B981',
-                                                        }
-                                                        return (
-                                                            <button
-                                                                key={risk}
-                                                                onClick={() => {
-                                                                    const newRisks = isSelected
-                                                                        ? localPrefs.defaultRiskLevels.filter((r) => r !== risk)
-                                                                        : [...localPrefs.defaultRiskLevels, risk]
-                                                                    updatePref('defaultRiskLevels', newRisks)
-                                                                }}
-                                                                className={cn(
-                                                                    'rounded-lg border px-3 py-1.5 text-xs font-medium capitalize transition-all',
-                                                                    isSelected
-                                                                        ? 'border-transparent text-white'
-                                                                        : 'border-[#E5E7EB] hover:border-current'
-                                                                )}
-                                                                style={{
-                                                                    backgroundColor: isSelected ? colorMap[risk] : undefined,
-                                                                    color: isSelected ? '#FFFFFF' : colorMap[risk],
-                                                                }}
-                                                            >
-                                                                {risk}
-                                                            </button>
-                                                        )
-                                                    })}
-                                                </div>
-                                                <p className="mt-2 text-xs text-[#9CA3AF]">Leave empty to show all risk levels</p>
-                                            </div>
-
-                                            <ToggleRow
-                                                label="Show Only Unresolved"
-                                                description="Filter to unresolved events by default"
-                                                checked={localPrefs.showOnlyUnresolved}
-                                                onChange={(v) => updatePref('showOnlyUnresolved', v)}
-                                            />
-                                        </motion.div>
-                                    )}
-
-                                    {activeTab === 'dashboard' && (
-                                        <motion.div
-                                            key="dashboard"
-                                            initial={{ opacity: 0, x: -10 }}
-                                            animate={{ opacity: 1, x: 0 }}
-                                            exit={{ opacity: 0, x: 10 }}
-                                            className="space-y-6"
-                                        >
-                                            {/* Default View */}
-                                            <div>
-                                                <label className="mb-3 block text-sm font-semibold text-[#111827]">Default Dashboard View</label>
-                                                <div className="grid grid-cols-4 gap-2">
-                                                    {[
-                                                        { value: 'overview', label: 'Overview', icon: Layout },
-                                                        { value: 'departments', label: 'Depts', icon: BarChart3 },
-                                                        { value: 'events', label: 'Events', icon: Bell },
-                                                        { value: 'insights', label: 'Insights', icon: Settings2 },
-                                                    ].map((option) => (
-                                                        <button
-                                                            key={option.value}
-                                                            onClick={() => updatePref('defaultView', option.value as UserPreferences['defaultView'])}
-                                                            className={cn(
-                                                                'flex flex-col items-center gap-1 rounded-lg border-2 px-3 py-3 text-xs font-medium transition-all',
-                                                                localPrefs.defaultView === option.value
-                                                                    ? 'border-[#6C63FF] bg-[#6C63FF]/5 text-[#6C63FF]'
-                                                                    : 'border-[#E5E7EB] text-[#6B7280] hover:border-[#D1D5DB]'
-                                                            )}
-                                                        >
-                                                            <option.icon className="size-5" />
-                                                            {option.label}
-                                                        </button>
-                                                    ))}
-                                                </div>
-                                            </div>
-
-                                            {/* Auto Refresh */}
-                                            <div>
-                                                <label className="mb-3 block text-sm font-semibold text-[#111827]">
-                                                    <Clock className="mr-2 inline size-4" />
-                                                    Auto Refresh Interval
-                                                </label>
-                                                <div className="grid grid-cols-5 gap-2">
-                                                    {[
-                                                        { value: 0, label: 'Off' },
-                                                        { value: 30, label: '30s' },
-                                                        { value: 60, label: '1m' },
-                                                        { value: 300, label: '5m' },
-                                                        { value: 900, label: '15m' },
-                                                    ].map((option) => (
-                                                        <button
-                                                            key={option.value}
-                                                            onClick={() => updatePref('autoRefreshInterval', option.value)}
-                                                            className={cn(
-                                                                'rounded-lg border-2 px-3 py-2 text-xs font-medium transition-all',
-                                                                localPrefs.autoRefreshInterval === option.value
-                                                                    ? 'border-[#6C63FF] bg-[#6C63FF]/5 text-[#6C63FF]'
-                                                                    : 'border-[#E5E7EB] text-[#6B7280] hover:border-[#D1D5DB]'
-                                                            )}
-                                                        >
-                                                            {option.label}
-                                                        </button>
-                                                    ))}
-                                                </div>
-                                            </div>
-
-                                            <ToggleRow
-                                                label="Chart Animations"
-                                                description="Enable smooth animations on charts"
-                                                checked={localPrefs.chartAnimations}
-                                                onChange={(v) => updatePref('chartAnimations', v)}
-                                            />
-                                        </motion.div>
-                                    )}
-                                </AnimatePresence>
-                            </div>
-
-                            {/* Footer */}
-                            <div className="flex items-center justify-between border-t border-[#E5E7EB] px-6 py-4">
-                                <button
-                                    onClick={resetToDefaults}
-                                    className="text-sm font-medium text-[#6B7280] hover:text-[#111827] transition-colors"
-                                >
-                                    Reset to Defaults
-                                </button>
-
-                                <div className="flex items-center gap-3">
-                                    <button
-                                        onClick={onClose}
-                                        className="rounded-lg px-4 py-2 text-sm font-medium text-[#6B7280] hover:bg-[#F3F4F6] transition-colors"
-                                    >
-                                        Cancel
-                                    </button>
-                                    <button
-                                        onClick={handleSave}
-                                        disabled={!hasChanges || isSaving}
-                                        className={cn(
-                                            'flex items-center gap-2 rounded-lg px-5 py-2 text-sm font-semibold text-white transition-all',
-                                            hasChanges && !isSaving
-                                                ? 'bg-[#6C63FF] hover:bg-[#5A52E6]'
-                                                : 'bg-[#D1D5DB] cursor-not-allowed'
-                                        )}
-                                    >
-                                        {isSaving ? (
-                                            <Loader2 className="size-4 animate-spin" />
-                                        ) : (
-                                            <Save className="size-4" />
-                                        )}
-                                        Save Changes
-                                    </button>
-                                </div>
-                            </div>
+                      {/* Default View */}
+                      <div>
+                        <label className="mb-3 block text-sm font-semibold text-[#111827]">
+                          Default Dashboard View
+                        </label>
+                        <div className="grid grid-cols-4 gap-2">
+                          {[
+                            { value: 'overview', label: 'Overview', icon: Layout },
+                            { value: 'departments', label: 'Depts', icon: BarChart3 },
+                            { value: 'events', label: 'Events', icon: Bell },
+                            { value: 'insights', label: 'Insights', icon: Settings2 },
+                          ].map((option) => (
+                            <button
+                              key={option.value}
+                              onClick={() =>
+                                updatePref(
+                                  'defaultView',
+                                  option.value as UserPreferences['defaultView']
+                                )
+                              }
+                              className={cn(
+                                'flex flex-col items-center gap-1 rounded-lg border-2 px-3 py-3 text-xs font-medium transition-all',
+                                localPrefs.defaultView === option.value
+                                  ? 'border-[#6C63FF] bg-[#6C63FF]/5 text-[#6C63FF]'
+                                  : 'border-[#E5E7EB] text-[#6B7280] hover:border-[#D1D5DB]'
+                              )}
+                            >
+                              <option.icon className="size-5" />
+                              {option.label}
+                            </button>
+                          ))}
                         </div>
+                      </div>
+
+                      {/* Auto Refresh */}
+                      <div>
+                        <label className="mb-3 block text-sm font-semibold text-[#111827]">
+                          <Clock className="mr-2 inline size-4" />
+                          Auto Refresh Interval
+                        </label>
+                        <div className="grid grid-cols-5 gap-2">
+                          {[
+                            { value: 0, label: 'Off' },
+                            { value: 30, label: '30s' },
+                            { value: 60, label: '1m' },
+                            { value: 300, label: '5m' },
+                            { value: 900, label: '15m' },
+                          ].map((option) => (
+                            <button
+                              key={option.value}
+                              onClick={() => updatePref('autoRefreshInterval', option.value)}
+                              className={cn(
+                                'rounded-lg border-2 px-3 py-2 text-xs font-medium transition-all',
+                                localPrefs.autoRefreshInterval === option.value
+                                  ? 'border-[#6C63FF] bg-[#6C63FF]/5 text-[#6C63FF]'
+                                  : 'border-[#E5E7EB] text-[#6B7280] hover:border-[#D1D5DB]'
+                              )}
+                            >
+                              {option.label}
+                            </button>
+                          ))}
+                        </div>
+                      </div>
+
+                      <ToggleRow
+                        label="Chart Animations"
+                        description="Enable smooth animations on charts"
+                        checked={localPrefs.chartAnimations}
+                        onChange={(v) => updatePref('chartAnimations', v)}
+                      />
                     </motion.div>
-                </>
-            )}
-        </AnimatePresence>
-    )
+                  )}
+                </AnimatePresence>
+              </div>
+
+              {/* Footer */}
+              <div className="flex items-center justify-between border-t border-[#E5E7EB] px-6 py-4">
+                <button
+                  onClick={resetToDefaults}
+                  className="text-sm font-medium text-[#6B7280] hover:text-[#111827] transition-colors"
+                >
+                  Reset to Defaults
+                </button>
+
+                <div className="flex items-center gap-3">
+                  <button
+                    onClick={onClose}
+                    className="rounded-lg px-4 py-2 text-sm font-medium text-[#6B7280] hover:bg-[#F3F4F6] transition-colors"
+                  >
+                    Cancel
+                  </button>
+                  <button
+                    onClick={handleSave}
+                    disabled={!hasChanges || isSaving}
+                    className={cn(
+                      'flex items-center gap-2 rounded-lg px-5 py-2 text-sm font-semibold text-white transition-all',
+                      hasChanges && !isSaving
+                        ? 'bg-[#6C63FF] hover:bg-[#5A52E6]'
+                        : 'bg-[#D1D5DB] cursor-not-allowed'
+                    )}
+                  >
+                    {isSaving ? (
+                      <Loader2 className="size-4 animate-spin" />
+                    ) : (
+                      <Save className="size-4" />
+                    )}
+                    Save Changes
+                  </button>
+                </div>
+              </div>
+            </div>
+          </motion.div>
+        </>
+      )}
+    </AnimatePresence>
+  )
 }
 
 // ============================================================================
@@ -632,43 +673,43 @@ export default function UserPreferencesModal({
 // ============================================================================
 
 interface ToggleRowProps {
-    label: string
-    description: string
-    checked: boolean
-    onChange: (checked: boolean) => void
-    icon?: React.ComponentType<{ className?: string }>
+  label: string
+  description: string
+  checked: boolean
+  onChange: (checked: boolean) => void
+  icon?: React.ComponentType<{ className?: string }>
 }
 
 function ToggleRow({ label, description, checked, onChange, icon: Icon }: ToggleRowProps) {
-    return (
-        <div className="flex items-center justify-between rounded-xl border border-[#E5E7EB] bg-[#FAFAFA] p-4">
-            <div className="flex items-center gap-3">
-                {Icon && (
-                    <div className="flex size-8 items-center justify-center rounded-lg bg-white">
-                        <Icon className="size-4 text-[#6B7280]" />
-                    </div>
-                )}
-                <div>
-                    <p className="text-sm font-medium text-[#111827]">{label}</p>
-                    <p className="text-xs text-[#6B7280]">{description}</p>
-                </div>
-            </div>
-            <button
-                onClick={() => onChange(!checked)}
-                className={cn(
-                    'relative h-6 w-11 rounded-full transition-colors',
-                    checked ? 'bg-[#6C63FF]' : 'bg-[#D1D5DB]'
-                )}
-            >
-                <span
-                    className={cn(
-                        'absolute top-0.5 left-0.5 h-5 w-5 rounded-full bg-white shadow-sm transition-transform',
-                        checked && 'translate-x-5'
-                    )}
-                />
-            </button>
+  return (
+    <div className="flex items-center justify-between rounded-xl border border-[#E5E7EB] bg-[#FAFAFA] p-4">
+      <div className="flex items-center gap-3">
+        {Icon && (
+          <div className="flex size-8 items-center justify-center rounded-lg bg-white">
+            <Icon className="size-4 text-[#6B7280]" />
+          </div>
+        )}
+        <div>
+          <p className="text-sm font-medium text-[#111827]">{label}</p>
+          <p className="text-xs text-[#6B7280]">{description}</p>
         </div>
-    )
+      </div>
+      <button
+        onClick={() => onChange(!checked)}
+        className={cn(
+          'relative h-6 w-11 rounded-full transition-colors',
+          checked ? 'bg-[#6C63FF]' : 'bg-[#D1D5DB]'
+        )}
+      >
+        <span
+          className={cn(
+            'absolute top-0.5 left-0.5 h-5 w-5 rounded-full bg-white shadow-sm transition-transform',
+            checked && 'translate-x-5'
+          )}
+        />
+      </button>
+    </div>
+  )
 }
 
 // ============================================================================
diff --git a/src/components/signals/SlackSignalPanel.tsx b/src/components/signals/SlackSignalPanel.tsx
index 3d954c8a..6955fd92 100644
--- a/src/components/signals/SlackSignalPanel.tsx
+++ b/src/components/signals/SlackSignalPanel.tsx
@@ -188,10 +188,12 @@ export function SlackSignalPanel({
   const StatusIcon = ({ status }: { status?: string }) => {
     switch (status) {
       case 'active':
-        return <span className="relative flex h-2 w-2">
-          <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-400 opacity-75" />
-          <span className="relative inline-flex h-2 w-2 rounded-full bg-green-500" />
-        </span>
+        return (
+          <span className="relative flex h-2 w-2">
+            <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-400 opacity-75" />
+            <span className="relative inline-flex h-2 w-2 rounded-full bg-green-500" />
+          </span>
+        )
       case 'idle':
         return <span className="h-2 w-2 rounded-full bg-amber-500" />
       case 'resolved':
@@ -274,231 +276,233 @@ export function SlackSignalPanel({
           {/* Channel Cards */}
           <div className="mt-3 space-y-2">
             <AnimatePresence>
-              {isLoading ? (
-                // Skeleton loading
-                Array.from({ length: 4 }).map((_, i) => (
-                  <div key={i} className="h-16 animate-pulse rounded-lg bg-white/5" />
-                ))
-              ) : (
-                sortedChannels.slice(0, 5).map((channel, index) => {
-                  const isExpanded = expandedChannel === channel.name
-                  const channelColor = getChannelColor(channel)
-                  const priorityColor = getPriorityColor(channel.priority)
-                  const heat = getActivityHeat(channel.activity)
+              {isLoading
+                ? // Skeleton loading
+                  Array.from({ length: 4 }).map((_, i) => (
+                    <div key={i} className="h-16 animate-pulse rounded-lg bg-white/5" />
+                  ))
+                : sortedChannels.slice(0, 5).map((channel, index) => {
+                    const isExpanded = expandedChannel === channel.name
+                    const channelColor = getChannelColor(channel)
+                    const priorityColor = getPriorityColor(channel.priority)
+                    const heat = getActivityHeat(channel.activity)
 
-                  return (
-                    <motion.div
-                      key={channel.name}
-                      initial={{ opacity: 0, y: 10 }}
-                      animate={{ opacity: 1, y: 0 }}
-                      exit={{ opacity: 0, y: -10 }}
-                      transition={{ delay: index * 0.05 }}
-                      className="relative"
-                    >
+                    return (
                       <motion.div
-                        layout
-                        onClick={() => setExpandedChannel(isExpanded ? null : channel.name)}
-                        className={cn(
-                          'group cursor-pointer rounded-lg border border-white/10 bg-gradient-to-r from-white/5 to-transparent px-3 py-2.5 transition-all duration-200',
-                          isExpanded && 'border-white/20 bg-white/10',
-                          channel.priority === 'critical' && 'border-l-2 border-l-red-500',
-                          channel.priority === 'high' && 'border-l-2 border-l-amber-500'
-                        )}
-                        style={{
-                          borderLeftColor: channel.priority === 'critical' || channel.priority === 'high'
-                            ? priorityColor
-                            : undefined,
-                        }}
-                        whileHover={{ scale: 1.01 }}
-                        whileTap={{ scale: 0.99 }}
+                        key={channel.name}
+                        initial={{ opacity: 0, y: 10 }}
+                        animate={{ opacity: 1, y: 0 }}
+                        exit={{ opacity: 0, y: -10 }}
+                        transition={{ delay: index * 0.05 }}
+                        className="relative"
                       >
-                        <div className="flex items-center justify-between">
-                          <div className="flex items-center gap-3">
-                            {/* Avatar / Icon */}
-                            {channel.lastAvatar ? (
-                              <div className="relative">
-                                <Image
-                                  src={channel.lastAvatar}
-                                  alt={channel.lastUser || channel.name}
-                                  width={32}
-                                  height={32}
-                                  className="h-8 w-8 rounded-full object-cover ring-2 ring-white/10"
-                                  loading="lazy"
-                                  unoptimized
-                                />
-                                <div className="absolute -bottom-0.5 -right-0.5">
-                                  <StatusIcon status={channel.status} />
-                                </div>
-                              </div>
-                            ) : (
-                              <div className="relative">
-                                <div
-                                  className="flex h-8 w-8 items-center justify-center rounded-full text-[11px] font-bold text-white ring-2 ring-white/10"
-                                  style={{ backgroundColor: channelColor }}
-                                >
-                                  <Hash className="size-3.5" />
-                                </div>
-                                <div className="absolute -bottom-0.5 -right-0.5">
-                                  <StatusIcon status={channel.status} />
-                                </div>
-                              </div>
-                            )}
-
-                            {/* Channel Info */}
-                            <div className="min-w-0 flex-1">
-                              {channel.agentAction ? (
-                                <div>
-                                  <div className="mb-0.5 flex items-center gap-1.5">
-                                    <Bot className="size-3 text-purple-400" />
-                                    <span className="text-xs font-semibold text-purple-200">
-                                      AI Agent Active
-                                    </span>
+                        <motion.div
+                          layout
+                          onClick={() => setExpandedChannel(isExpanded ? null : channel.name)}
+                          className={cn(
+                            'group cursor-pointer rounded-lg border border-white/10 bg-gradient-to-r from-white/5 to-transparent px-3 py-2.5 transition-all duration-200',
+                            isExpanded && 'border-white/20 bg-white/10',
+                            channel.priority === 'critical' && 'border-l-2 border-l-red-500',
+                            channel.priority === 'high' && 'border-l-2 border-l-amber-500'
+                          )}
+                          style={{
+                            borderLeftColor:
+                              channel.priority === 'critical' || channel.priority === 'high'
+                                ? priorityColor
+                                : undefined,
+                          }}
+                          whileHover={{ scale: 1.01 }}
+                          whileTap={{ scale: 0.99 }}
+                        >
+                          <div className="flex items-center justify-between">
+                            <div className="flex items-center gap-3">
+                              {/* Avatar / Icon */}
+                              {channel.lastAvatar ? (
+                                <div className="relative">
+                                  <Image
+                                    src={channel.lastAvatar}
+                                    alt={channel.lastUser || channel.name}
+                                    width={32}
+                                    height={32}
+                                    className="h-8 w-8 rounded-full object-cover ring-2 ring-white/10"
+                                    loading="lazy"
+                                    unoptimized
+                                  />
+                                  <div className="absolute -bottom-0.5 -right-0.5">
+                                    <StatusIcon status={channel.status} />
                                   </div>
-                                  <p className="truncate text-[11px] font-medium text-purple-300/80">
-                                    {channel.agentAction.summary}
-                                  </p>
                                 </div>
                               ) : (
-                                <div>
-                                  <div className="flex items-center gap-2">
-                                    <span className="text-xs font-semibold text-slate-100">
-                                      {channel.name}
-                                    </span>
-                                    {channel.department && (
-                                      <span
-                                        className="rounded px-1 py-0.5 text-[9px] font-medium"
-                                        style={{
-                                          backgroundColor: `${channelColor}20`,
-                                          color: channelColor,
-                                        }}
-                                      >
-                                        {channel.department}
-                                      </span>
-                                    )}
+                                <div className="relative">
+                                  <div
+                                    className="flex h-8 w-8 items-center justify-center rounded-full text-[11px] font-bold text-white ring-2 ring-white/10"
+                                    style={{ backgroundColor: channelColor }}
+                                  >
+                                    <Hash className="size-3.5" />
+                                  </div>
+                                  <div className="absolute -bottom-0.5 -right-0.5">
+                                    <StatusIcon status={channel.status} />
                                   </div>
-                                  <p className="mt-0.5 truncate text-[11px] text-slate-400">
-                                    {channel.lastUser && `${channel.lastUser}: `}
-                                    {channel.lastEvent || 'No recent activity'}
-                                  </p>
                                 </div>
                               )}
-                            </div>
-                          </div>
 
-                          {/* Right Side: Activity & Actions */}
-                          <div className="flex items-center gap-2">
-                            {/* Activity Heat */}
-                            {channel.activity !== undefined && (
-                              <div className="flex items-center gap-1">
-                                {Array.from({ length: 3 }).map((_, i) => (
-                                  <div
-                                    key={i}
-                                    className={cn(
-                                      'h-3 w-1 rounded-full transition-colors',
-                                      i < heat ? 'bg-emerald-400' : 'bg-white/10'
-                                    )}
-                                  />
-                                ))}
-                                <span className="ml-1 text-[10px] text-slate-400">
-                                  {channel.activity}
-                                </span>
+                              {/* Channel Info */}
+                              <div className="min-w-0 flex-1">
+                                {channel.agentAction ? (
+                                  <div>
+                                    <div className="mb-0.5 flex items-center gap-1.5">
+                                      <Bot className="size-3 text-purple-400" />
+                                      <span className="text-xs font-semibold text-purple-200">
+                                        AI Agent Active
+                                      </span>
+                                    </div>
+                                    <p className="truncate text-[11px] font-medium text-purple-300/80">
+                                      {channel.agentAction.summary}
+                                    </p>
+                                  </div>
+                                ) : (
+                                  <div>
+                                    <div className="flex items-center gap-2">
+                                      <span className="text-xs font-semibold text-slate-100">
+                                        {channel.name}
+                                      </span>
+                                      {channel.department && (
+                                        <span
+                                          className="rounded px-1 py-0.5 text-[9px] font-medium"
+                                          style={{
+                                            backgroundColor: `${channelColor}20`,
+                                            color: channelColor,
+                                          }}
+                                        >
+                                          {channel.department}
+                                        </span>
+                                      )}
+                                    </div>
+                                    <p className="mt-0.5 truncate text-[11px] text-slate-400">
+                                      {channel.lastUser && `${channel.lastUser}: `}
+                                      {channel.lastEvent || 'No recent activity'}
+                                    </p>
+                                  </div>
+                                )}
                               </div>
-                            )}
+                            </div>
+
+                            {/* Right Side: Activity & Actions */}
+                            <div className="flex items-center gap-2">
+                              {/* Activity Heat */}
+                              {channel.activity !== undefined && (
+                                <div className="flex items-center gap-1">
+                                  {Array.from({ length: 3 }).map((_, i) => (
+                                    <div
+                                      key={i}
+                                      className={cn(
+                                        'h-3 w-1 rounded-full transition-colors',
+                                        i < heat ? 'bg-emerald-400' : 'bg-white/10'
+                                      )}
+                                    />
+                                  ))}
+                                  <span className="ml-1 text-[10px] text-slate-400">
+                                    {channel.activity}
+                                  </span>
+                                </div>
+                              )}
 
-                            {/* Time */}
-                            <span className="text-[10px] text-slate-500">
-                              {formatRelativeTime(channel.lastAt)}
-                            </span>
+                              {/* Time */}
+                              <span className="text-[10px] text-slate-500">
+                                {formatRelativeTime(channel.lastAt)}
+                              </span>
 
-                            {/* Actions */}
-                            <div className="flex items-center gap-1 opacity-0 transition-opacity group-hover:opacity-100">
-                              {channel.priority === 'critical' && !channel.agentAction && (
+                              {/* Actions */}
+                              <div className="flex items-center gap-1 opacity-0 transition-opacity group-hover:opacity-100">
+                                {channel.priority === 'critical' && !channel.agentAction && (
+                                  <motion.button
+                                    whileHover={{ scale: 1.05 }}
+                                    whileTap={{ scale: 0.95 }}
+                                    className="flex items-center gap-1 rounded-md bg-purple-500/20 px-2 py-1 text-[10px] font-medium text-purple-300 hover:bg-purple-500/30"
+                                    onClick={async (e) => {
+                                      e.stopPropagation()
+                                      try {
+                                        await fetch('/api/agent/trigger', {
+                                          method: 'POST',
+                                          body: JSON.stringify({
+                                            action: 'remediate',
+                                            context: channel,
+                                          }),
+                                        })
+                                      } catch {
+                                        // Silent fail
+                                      }
+                                    }}
+                                  >
+                                    <Zap className="size-3" />
+                                    Fix
+                                  </motion.button>
+                                )}
                                 <motion.button
                                   whileHover={{ scale: 1.05 }}
                                   whileTap={{ scale: 0.95 }}
-                                  className="flex items-center gap-1 rounded-md bg-purple-500/20 px-2 py-1 text-[10px] font-medium text-purple-300 hover:bg-purple-500/30"
-                                  onClick={async (e) => {
+                                  className="flex items-center gap-1 rounded-md bg-sky-500/20 px-2 py-1 text-[10px] font-medium text-sky-300 hover:bg-sky-500/30"
+                                  onClick={(e) => {
                                     e.stopPropagation()
-                                    try {
-                                      await fetch('/api/agent/trigger', {
-                                        method: 'POST',
-                                        body: JSON.stringify({ action: 'remediate', context: channel }),
-                                      })
-                                    } catch {
-                                      // Silent fail
-                                    }
+                                    onChannelOpen?.(channel.name)
                                   }}
+                                  aria-label={`Open Slack channel ${channel.name}`}
                                 >
-                                  <Zap className="size-3" />
-                                  Fix
+                                  <ExternalLink className="size-3" />
+                                  Open
                                 </motion.button>
-                              )}
-                              <motion.button
-                                whileHover={{ scale: 1.05 }}
-                                whileTap={{ scale: 0.95 }}
-                                className="flex items-center gap-1 rounded-md bg-sky-500/20 px-2 py-1 text-[10px] font-medium text-sky-300 hover:bg-sky-500/30"
-                                onClick={(e) => {
-                                  e.stopPropagation()
-                                  onChannelOpen?.(channel.name)
-                                }}
-                                aria-label={`Open Slack channel ${channel.name}`}
-                              >
-                                <ExternalLink className="size-3" />
-                                Open
-                              </motion.button>
+                              </div>
                             </div>
                           </div>
-                        </div>
 
-                        {/* Expanded Details */}
-                        <AnimatePresence>
-                          {isExpanded && (
-                            <motion.div
-                              initial={{ height: 0, opacity: 0 }}
-                              animate={{ height: 'auto', opacity: 1 }}
-                              exit={{ height: 0, opacity: 0 }}
-                              transition={{ duration: 0.2 }}
-                              className="overflow-hidden"
-                            >
-                              <div className="mt-3 border-t border-white/10 pt-3">
-                                <div className="grid grid-cols-3 gap-3 text-center">
-                                  <div>
-                                    <p className="text-[10px] text-slate-500">Status</p>
-                                    <p className="text-xs font-medium capitalize text-slate-200">
-                                      {channel.status || 'Unknown'}
-                                    </p>
-                                  </div>
-                                  <div>
-                                    <p className="text-[10px] text-slate-500">Priority</p>
-                                    <p
-                                      className="text-xs font-medium capitalize"
-                                      style={{ color: priorityColor }}
-                                    >
-                                      {channel.priority || 'Low'}
-                                    </p>
+                          {/* Expanded Details */}
+                          <AnimatePresence>
+                            {isExpanded && (
+                              <motion.div
+                                initial={{ height: 0, opacity: 0 }}
+                                animate={{ height: 'auto', opacity: 1 }}
+                                exit={{ height: 0, opacity: 0 }}
+                                transition={{ duration: 0.2 }}
+                                className="overflow-hidden"
+                              >
+                                <div className="mt-3 border-t border-white/10 pt-3">
+                                  <div className="grid grid-cols-3 gap-3 text-center">
+                                    <div>
+                                      <p className="text-[10px] text-slate-500">Status</p>
+                                      <p className="text-xs font-medium capitalize text-slate-200">
+                                        {channel.status || 'Unknown'}
+                                      </p>
+                                    </div>
+                                    <div>
+                                      <p className="text-[10px] text-slate-500">Priority</p>
+                                      <p
+                                        className="text-xs font-medium capitalize"
+                                        style={{ color: priorityColor }}
+                                      >
+                                        {channel.priority || 'Low'}
+                                      </p>
+                                    </div>
+                                    <div>
+                                      <p className="text-[10px] text-slate-500">Activity</p>
+                                      <p className="text-xs font-medium text-slate-200">
+                                        {channel.activity ?? 0} messages
+                                      </p>
+                                    </div>
                                   </div>
-                                  <div>
-                                    <p className="text-[10px] text-slate-500">Activity</p>
-                                    <p className="text-xs font-medium text-slate-200">
-                                      {channel.activity ?? 0} messages
+                                  {channel.lastEvent && (
+                                    <p className="mt-2 text-[11px] text-slate-400">
+                                      <span className="font-medium text-slate-300">Latest:</span>{' '}
+                                      {channel.lastEvent}
                                     </p>
-                                  </div>
+                                  )}
                                 </div>
-                                {channel.lastEvent && (
-                                  <p className="mt-2 text-[11px] text-slate-400">
-                                    <span className="font-medium text-slate-300">Latest:</span>{' '}
-                                    {channel.lastEvent}
-                                  </p>
-                                )}
-                              </div>
-                            </motion.div>
-                          )}
-                        </AnimatePresence>
+                              </motion.div>
+                            )}
+                          </AnimatePresence>
+                        </motion.div>
                       </motion.div>
-                    </motion.div>
-                  )
-                })
-              )}
+                    )
+                  })}
             </AnimatePresence>
           </div>
 
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
index 0b7c2e11..0757f7f5 100644
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -11,7 +11,7 @@ import { buttonVariants } from './button-variants'
 
 export interface ButtonProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement>,
-  VariantProps<typeof buttonVariants> {
+    VariantProps<typeof buttonVariants> {
   asChild?: boolean
   isLoading?: boolean
 }
diff --git a/src/components/ui/sheet.tsx b/src/components/ui/sheet.tsx
index 1d5be235..2f85f4ff 100644
--- a/src/components/ui/sheet.tsx
+++ b/src/components/ui/sheet.tsx
@@ -54,13 +54,13 @@ function SheetContent({
         className={cn(
           'bg-[#0f1524] border-white/10 text-slate-100 data-[state=open]:animate-in data-[state=closed]:animate-out fixed z-50 flex flex-col gap-4 shadow-2xl shadow-black/40 transition-all duration-300 ease-bounce',
           side === 'right' &&
-          'data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right inset-y-0 right-0 h-full w-3/4 border-l sm:max-w-sm',
+            'data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right inset-y-0 right-0 h-full w-3/4 border-l sm:max-w-sm',
           side === 'left' &&
-          'data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left inset-y-0 left-0 h-full w-3/4 border-r sm:max-w-sm',
+            'data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left inset-y-0 left-0 h-full w-3/4 border-r sm:max-w-sm',
           side === 'top' &&
-          'data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top inset-x-0 top-0 h-auto border-b',
+            'data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top inset-x-0 top-0 h-auto border-b',
           side === 'bottom' &&
-          'data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom inset-x-0 bottom-0 h-auto border-t',
+            'data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom inset-x-0 bottom-0 h-auto border-t',
           className
         )}
         {...props}
diff --git a/src/components/ui/skeleton.tsx b/src/components/ui/skeleton.tsx
index 337a8ee9..8ff88c2d 100644
--- a/src/components/ui/skeleton.tsx
+++ b/src/components/ui/skeleton.tsx
@@ -13,29 +13,26 @@ import { cn } from '@/lib/utils'
  */
 
 interface SkeletonProps {
-    className?: string
-    variant?: 'text' | 'circular' | 'rectangular'
-    animation?: 'pulse' | 'wave' | 'none'
+  className?: string
+  variant?: 'text' | 'circular' | 'rectangular'
+  animation?: 'pulse' | 'wave' | 'none'
 }
 
-export function Skeleton({
-    className,
-    variant = 'text',
-    animation = 'pulse',
-}: SkeletonProps) {
-    return (
-        <div
-            className={cn(
-                'bg-white/10',
-                animation === 'pulse' && 'animate-pulse',
-                animation === 'wave' && 'animate-shimmer bg-gradient-to-r from-white/5 via-white/10 to-white/5 bg-[length:400%_100%]',
-                variant === 'text' && 'rounded',
-                variant === 'circular' && 'rounded-full',
-                variant === 'rectangular' && 'rounded-lg',
-                className
-            )}
-        />
-    )
+export function Skeleton({ className, variant = 'text', animation = 'pulse' }: SkeletonProps) {
+  return (
+    <div
+      className={cn(
+        'bg-white/10',
+        animation === 'pulse' && 'animate-pulse',
+        animation === 'wave' &&
+          'animate-shimmer bg-gradient-to-r from-white/5 via-white/10 to-white/5 bg-[length:400%_100%]',
+        variant === 'text' && 'rounded',
+        variant === 'circular' && 'rounded-full',
+        variant === 'rectangular' && 'rounded-lg',
+        className
+      )}
+    />
+  )
 }
 
 // ============================================================================
@@ -43,82 +40,75 @@ export function Skeleton({
 // ============================================================================
 
 interface SkeletonTextProps {
-    lines?: number
-    className?: string
-    lastLineWidth?: string
+  lines?: number
+  className?: string
+  lastLineWidth?: string
 }
 
 export function SkeletonText({ lines = 3, className, lastLineWidth = '60%' }: SkeletonTextProps) {
-    return (
-        <div className={cn('space-y-2', className)}>
-            {Array.from({ length: lines }).map((_, i) => (
-                <div
-                    key={i}
-                    style={i === lines - 1 ? { width: lastLineWidth } : undefined}
-                >
-                    <Skeleton className="h-3 w-full" />
-                </div>
-            ))}
+  return (
+    <div className={cn('space-y-2', className)}>
+      {Array.from({ length: lines }).map((_, i) => (
+        <div key={i} style={i === lines - 1 ? { width: lastLineWidth } : undefined}>
+          <Skeleton className="h-3 w-full" />
         </div>
-    )
+      ))}
+    </div>
+  )
 }
 
 interface SkeletonCardProps {
-    showImage?: boolean
-    showTitle?: boolean
-    showDescription?: boolean
-    showFooter?: boolean
-    className?: string
+  showImage?: boolean
+  showTitle?: boolean
+  showDescription?: boolean
+  showFooter?: boolean
+  className?: string
 }
 
 export function SkeletonCard({
-    showImage = true,
-    showTitle = true,
-    showDescription = true,
-    showFooter = false,
-    className,
+  showImage = true,
+  showTitle = true,
+  showDescription = true,
+  showFooter = false,
+  className,
 }: SkeletonCardProps) {
-    return (
-        <div className={cn('rounded-lg border border-white/10 bg-white/5 p-4', className)}>
-            {showImage && (
-                <Skeleton variant="rectangular" className="mb-4 h-32 w-full" />
-            )}
-            {showTitle && (
-                <Skeleton className="mb-2 h-5 w-3/4" />
-            )}
-            {showDescription && (
-                <div className="space-y-2">
-                    <Skeleton className="h-3 w-full" />
-                    <Skeleton className="h-3 w-5/6" />
-                </div>
-            )}
-            {showFooter && (
-                <div className="mt-4 flex items-center justify-between">
-                    <Skeleton className="h-8 w-24" />
-                    <Skeleton variant="circular" className="h-8 w-8" />
-                </div>
-            )}
+  return (
+    <div className={cn('rounded-lg border border-white/10 bg-white/5 p-4', className)}>
+      {showImage && <Skeleton variant="rectangular" className="mb-4 h-32 w-full" />}
+      {showTitle && <Skeleton className="mb-2 h-5 w-3/4" />}
+      {showDescription && (
+        <div className="space-y-2">
+          <Skeleton className="h-3 w-full" />
+          <Skeleton className="h-3 w-5/6" />
         </div>
-    )
+      )}
+      {showFooter && (
+        <div className="mt-4 flex items-center justify-between">
+          <Skeleton className="h-8 w-24" />
+          <Skeleton variant="circular" className="h-8 w-8" />
+        </div>
+      )}
+    </div>
+  )
 }
 
 export function SkeletonAvatar({ size = 'md' }: { size?: 'sm' | 'md' | 'lg' | 'xl' }) {
-    const sizeClasses = {
-        sm: 'h-6 w-6',
-        md: 'h-10 w-10',
-        lg: 'h-12 w-12',
-        xl: 'h-16 w-16',
-    }
-    return <Skeleton variant="circular" className={sizeClasses[size]} />
+  const sizeClasses = {
+    sm: 'h-6 w-6',
+    md: 'h-10 w-10',
+    lg: 'h-12 w-12',
+    xl: 'h-16 w-16',
+  }
+  return <Skeleton variant="circular" className={sizeClasses[size]} />
 }
 
 export function SkeletonButton({ variant = 'md' }: { variant?: 'sm' | 'md' | 'lg' }) {
-    const sizeClasses = {
-        sm: 'h-8 w-20',
-        md: 'h-10 w-24',
-        lg: 'h-12 w-32',
-    }
-    return <Skeleton variant="rectangular" className={cn('rounded-lg', sizeClasses[variant])} />
+  const sizeClasses = {
+    sm: 'h-8 w-20',
+    md: 'h-10 w-24',
+    lg: 'h-12 w-32',
+  }
+  return <Skeleton variant="rectangular" className={cn('rounded-lg', sizeClasses[variant])} />
 }
 
 // ============================================================================
@@ -126,102 +116,104 @@ export function SkeletonButton({ variant = 'md' }: { variant?: 'sm' | 'md' | 'lg
 // ============================================================================
 
 export function SkeletonMetricCard({ className }: { className?: string }) {
-    return (
-        <div className={cn('rounded-xl border border-white/10 bg-white/5 p-4', className)}>
-            <Skeleton className="mb-3 h-3 w-20" />
-            <Skeleton className="mb-2 h-8 w-16" />
-            <Skeleton className="h-3 w-24" />
-        </div>
-    )
+  return (
+    <div className={cn('rounded-xl border border-white/10 bg-white/5 p-4', className)}>
+      <Skeleton className="mb-3 h-3 w-20" />
+      <Skeleton className="mb-2 h-8 w-16" />
+      <Skeleton className="h-3 w-24" />
+    </div>
+  )
 }
 
 export function SkeletonEventRow({ className }: { className?: string }) {
-    return (
-        <div className={cn('flex items-center gap-3 rounded-lg border border-white/10 bg-white/5 p-3', className)}>
-            <SkeletonAvatar size="sm" />
-            <div className="flex-1 space-y-1.5">
-                <Skeleton className="h-3.5 w-3/4" />
-                <Skeleton className="h-2.5 w-1/2" />
-            </div>
-            <Skeleton className="h-6 w-16 rounded-full" />
-        </div>
-    )
+  return (
+    <div
+      className={cn(
+        'flex items-center gap-3 rounded-lg border border-white/10 bg-white/5 p-3',
+        className
+      )}
+    >
+      <SkeletonAvatar size="sm" />
+      <div className="flex-1 space-y-1.5">
+        <Skeleton className="h-3.5 w-3/4" />
+        <Skeleton className="h-2.5 w-1/2" />
+      </div>
+      <Skeleton className="h-6 w-16 rounded-full" />
+    </div>
+  )
 }
 
 export function SkeletonChart({ className }: { className?: string }) {
-    return (
-        <div className={cn('rounded-xl border border-white/10 bg-white/5 p-4', className)}>
-            <div className="mb-4 flex items-center justify-between">
-                <Skeleton className="h-4 w-32" />
-                <div className="flex gap-2">
-                    <Skeleton className="h-6 w-6 rounded" />
-                    <Skeleton className="h-6 w-6 rounded" />
-                </div>
-            </div>
-            <Skeleton variant="rectangular" className="h-48 w-full" />
+  return (
+    <div className={cn('rounded-xl border border-white/10 bg-white/5 p-4', className)}>
+      <div className="mb-4 flex items-center justify-between">
+        <Skeleton className="h-4 w-32" />
+        <div className="flex gap-2">
+          <Skeleton className="h-6 w-6 rounded" />
+          <Skeleton className="h-6 w-6 rounded" />
         </div>
-    )
+      </div>
+      <Skeleton variant="rectangular" className="h-48 w-full" />
+    </div>
+  )
 }
 
 export function SkeletonTable({ rows = 5, cols = 4 }: { rows?: number; cols?: number }) {
-    return (
-        <div className="rounded-xl border border-white/10 bg-white/5 overflow-hidden">
-            {/* Header */}
-            <div className="flex gap-4 border-b border-white/10 bg-white/5 p-3">
-                {Array.from({ length: cols }).map((_, i) => (
-                    <Skeleton key={i} className="h-3 flex-1" />
-                ))}
-            </div>
-            {/* Rows */}
-            {Array.from({ length: rows }).map((_, rowIdx) => (
-                <div key={rowIdx} className="flex gap-4 border-b border-white/5 p-3 last:border-b-0">
-                    {Array.from({ length: cols }).map((_, colIdx) => (
-                        <Skeleton
-                            key={colIdx}
-                            className={cn('h-3 flex-1', colIdx === 0 && 'w-1/4')}
-                        />
-                    ))}
-                </div>
-            ))}
+  return (
+    <div className="rounded-xl border border-white/10 bg-white/5 overflow-hidden">
+      {/* Header */}
+      <div className="flex gap-4 border-b border-white/10 bg-white/5 p-3">
+        {Array.from({ length: cols }).map((_, i) => (
+          <Skeleton key={i} className="h-3 flex-1" />
+        ))}
+      </div>
+      {/* Rows */}
+      {Array.from({ length: rows }).map((_, rowIdx) => (
+        <div key={rowIdx} className="flex gap-4 border-b border-white/5 p-3 last:border-b-0">
+          {Array.from({ length: cols }).map((_, colIdx) => (
+            <Skeleton key={colIdx} className={cn('h-3 flex-1', colIdx === 0 && 'w-1/4')} />
+          ))}
         </div>
-    )
+      ))}
+    </div>
+  )
 }
 
 export function SkeletonDashboard() {
-    return (
-        <div className="space-y-6 p-6">
-            {/* Header */}
-            <div className="flex items-center justify-between">
-                <div>
-                    <Skeleton className="mb-2 h-6 w-48" />
-                    <Skeleton className="h-3 w-32" />
-                </div>
-                <div className="flex gap-2">
-                    <SkeletonButton variant="sm" />
-                    <SkeletonButton variant="sm" />
-                </div>
-            </div>
-
-            {/* Metrics Row */}
-            <div className="grid grid-cols-1 gap-4 md:grid-cols-3 lg:grid-cols-4">
-                <SkeletonMetricCard />
-                <SkeletonMetricCard />
-                <SkeletonMetricCard />
-                <SkeletonMetricCard className="hidden lg:block" />
-            </div>
-
-            {/* Main Content */}
-            <div className="grid grid-cols-1 gap-6 lg:grid-cols-3">
-                <div className="lg:col-span-2">
-                    <SkeletonChart className="h-80" />
-                </div>
-                <div className="space-y-4">
-                    <SkeletonEventRow />
-                    <SkeletonEventRow />
-                    <SkeletonEventRow />
-                    <SkeletonEventRow />
-                </div>
-            </div>
+  return (
+    <div className="space-y-6 p-6">
+      {/* Header */}
+      <div className="flex items-center justify-between">
+        <div>
+          <Skeleton className="mb-2 h-6 w-48" />
+          <Skeleton className="h-3 w-32" />
+        </div>
+        <div className="flex gap-2">
+          <SkeletonButton variant="sm" />
+          <SkeletonButton variant="sm" />
+        </div>
+      </div>
+
+      {/* Metrics Row */}
+      <div className="grid grid-cols-1 gap-4 md:grid-cols-3 lg:grid-cols-4">
+        <SkeletonMetricCard />
+        <SkeletonMetricCard />
+        <SkeletonMetricCard />
+        <SkeletonMetricCard className="hidden lg:block" />
+      </div>
+
+      {/* Main Content */}
+      <div className="grid grid-cols-1 gap-6 lg:grid-cols-3">
+        <div className="lg:col-span-2">
+          <SkeletonChart className="h-80" />
+        </div>
+        <div className="space-y-4">
+          <SkeletonEventRow />
+          <SkeletonEventRow />
+          <SkeletonEventRow />
+          <SkeletonEventRow />
         </div>
-    )
+      </div>
+    </div>
+  )
 }
diff --git a/src/hooks/use-haptic.ts b/src/hooks/use-haptic.ts
index 6d97874a..dc45145d 100644
--- a/src/hooks/use-haptic.ts
+++ b/src/hooks/use-haptic.ts
@@ -1,45 +1,45 @@
-import { useCallback } from 'react';
+import { useCallback } from 'react'
 
-type HapticType = 'success' | 'warning' | 'error' | 'light' | 'medium' | 'heavy' | 'selection';
+type HapticType = 'success' | 'warning' | 'error' | 'light' | 'medium' | 'heavy' | 'selection'
 
 export const useHaptic = () => {
-    const trigger = useCallback((type: HapticType = 'light') => {
-        // Check if Vibration API is supported
-        if (typeof window === 'undefined' || !window.navigator || !window.navigator.vibrate) {
-            return;
-        }
+  const trigger = useCallback((type: HapticType = 'light') => {
+    // Check if Vibration API is supported
+    if (typeof window === 'undefined' || !window.navigator || !window.navigator.vibrate) {
+      return
+    }
 
-        try {
-            switch (type) {
-                case 'success':
-                    window.navigator.vibrate([10, 30, 10]);
-                    break;
-                case 'warning':
-                    window.navigator.vibrate([10, 50]);
-                    break;
-                case 'error':
-                    window.navigator.vibrate([50, 100, 50, 100, 50]);
-                    break;
-                case 'light':
-                    window.navigator.vibrate(10);
-                    break;
-                case 'medium':
-                    window.navigator.vibrate(20);
-                    break;
-                case 'heavy':
-                    window.navigator.vibrate(40);
-                    break;
-                case 'selection':
-                    window.navigator.vibrate(5);
-                    break;
-                default:
-                    window.navigator.vibrate(10);
-            }
-        } catch (e) {
-            // Ignore errors if vibration fails (e.g. user interaction requirements)
-            console.warn('Haptic feedback failed', e);
-        }
-    }, []);
+    try {
+      switch (type) {
+        case 'success':
+          window.navigator.vibrate([10, 30, 10])
+          break
+        case 'warning':
+          window.navigator.vibrate([10, 50])
+          break
+        case 'error':
+          window.navigator.vibrate([50, 100, 50, 100, 50])
+          break
+        case 'light':
+          window.navigator.vibrate(10)
+          break
+        case 'medium':
+          window.navigator.vibrate(20)
+          break
+        case 'heavy':
+          window.navigator.vibrate(40)
+          break
+        case 'selection':
+          window.navigator.vibrate(5)
+          break
+        default:
+          window.navigator.vibrate(10)
+      }
+    } catch (e) {
+      // Ignore errors if vibration fails (e.g. user interaction requirements)
+      console.warn('Haptic feedback failed', e)
+    }
+  }, [])
 
-    return { trigger };
-};
+  return { trigger }
+}
diff --git a/src/hooks/useEventAnnotations.ts b/src/hooks/useEventAnnotations.ts
index b1d093df..1fd5d8d2 100644
--- a/src/hooks/useEventAnnotations.ts
+++ b/src/hooks/useEventAnnotations.ts
@@ -4,140 +4,139 @@ import { useState, useCallback, useEffect } from 'react'
 import type { Annotation } from '@/components/events/EventAnnotations'
 
 interface UseEventAnnotationsOptions {
-    eventId: string
-    autoFetch?: boolean
+  eventId: string
+  autoFetch?: boolean
 }
 
 interface UseEventAnnotationsReturn {
-    annotations: Annotation[]
-    isLoading: boolean
-    error: string | null
-    addAnnotation: (content: string, parentId?: string) => Promise<void>
-    editAnnotation: (id: string, content: string) => Promise<void>
-    deleteAnnotation: (id: string) => Promise<void>
-    react: (id: string, emoji: string) => Promise<void>
-    refresh: () => Promise<void>
+  annotations: Annotation[]
+  isLoading: boolean
+  error: string | null
+  addAnnotation: (content: string, parentId?: string) => Promise<void>
+  editAnnotation: (id: string, content: string) => Promise<void>
+  deleteAnnotation: (id: string) => Promise<void>
+  react: (id: string, emoji: string) => Promise<void>
+  refresh: () => Promise<void>
 }
 
 export function useEventAnnotations({
-    eventId,
-    autoFetch = true,
+  eventId,
+  autoFetch = true,
 }: UseEventAnnotationsOptions): UseEventAnnotationsReturn {
-    const [annotations, setAnnotations] = useState<Annotation[]>([])
-    const [isLoading, setIsLoading] = useState(false)
-    const [error, setError] = useState<string | null>(null)
-
-    const fetchAnnotations = useCallback(async () => {
-        if (!eventId) return
-
-        setIsLoading(true)
-        setError(null)
-
-        try {
-            const res = await fetch(`/api/events/annotations?eventId=${encodeURIComponent(eventId)}`)
-            if (!res.ok) {
-                const body = await res.json().catch(() => ({}))
-                throw new Error(body.error || `Failed to fetch annotations (${res.status})`)
-            }
-            const data = await res.json()
-            setAnnotations(data.annotations || [])
-        } catch (err) {
-            console.error('Failed to fetch annotations:', err)
-            setError(err instanceof Error ? err.message : 'Failed to fetch annotations')
-        } finally {
-            setIsLoading(false)
-        }
-    }, [eventId])
-
-    useEffect(() => {
-        if (autoFetch && eventId) {
-            fetchAnnotations()
-        }
-    }, [autoFetch, eventId, fetchAnnotations])
-
-    const addAnnotation = useCallback(
-        async (content: string, parentId?: string) => {
-            const res = await fetch('/api/events/annotations', {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ eventId, content, parentId }),
-            })
-
-            if (!res.ok) {
-                const body = await res.json().catch(() => ({}))
-                throw new Error(body.error || `Failed to add annotation (${res.status})`)
-            }
-
-            const data = await res.json()
-
-            // Optimistic update
-            setAnnotations((prev) => [...prev, data.annotation])
-        },
-        [eventId]
+  const [annotations, setAnnotations] = useState<Annotation[]>([])
+  const [isLoading, setIsLoading] = useState(false)
+  const [error, setError] = useState<string | null>(null)
+
+  const fetchAnnotations = useCallback(async () => {
+    if (!eventId) return
+
+    setIsLoading(true)
+    setError(null)
+
+    try {
+      const res = await fetch(`/api/events/annotations?eventId=${encodeURIComponent(eventId)}`)
+      if (!res.ok) {
+        const body = await res.json().catch(() => ({}))
+        throw new Error(body.error || `Failed to fetch annotations (${res.status})`)
+      }
+      const data = await res.json()
+      setAnnotations(data.annotations || [])
+    } catch (err) {
+      console.error('Failed to fetch annotations:', err)
+      setError(err instanceof Error ? err.message : 'Failed to fetch annotations')
+    } finally {
+      setIsLoading(false)
+    }
+  }, [eventId])
+
+  useEffect(() => {
+    if (autoFetch && eventId) {
+      fetchAnnotations()
+    }
+  }, [autoFetch, eventId, fetchAnnotations])
+
+  const addAnnotation = useCallback(
+    async (content: string, parentId?: string) => {
+      const res = await fetch('/api/events/annotations', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ eventId, content, parentId }),
+      })
+
+      if (!res.ok) {
+        const body = await res.json().catch(() => ({}))
+        throw new Error(body.error || `Failed to add annotation (${res.status})`)
+      }
+
+      const data = await res.json()
+
+      // Optimistic update
+      setAnnotations((prev) => [...prev, data.annotation])
+    },
+    [eventId]
+  )
+
+  const editAnnotation = useCallback(async (annotationId: string, content: string) => {
+    const res = await fetch('/api/events/annotations', {
+      method: 'PUT',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ annotationId, content }),
+    })
+
+    if (!res.ok) {
+      const body = await res.json().catch(() => ({}))
+      throw new Error(body.error || `Failed to edit annotation (${res.status})`)
+    }
+
+    const data = await res.json()
+
+    // Update in state
+    setAnnotations((prev) => prev.map((a) => (a.id === annotationId ? data.annotation : a)))
+  }, [])
+
+  const deleteAnnotation = useCallback(async (annotationId: string) => {
+    const res = await fetch(
+      `/api/events/annotations?annotationId=${encodeURIComponent(annotationId)}`,
+      {
+        method: 'DELETE',
+      }
     )
 
-    const editAnnotation = useCallback(async (annotationId: string, content: string) => {
-        const res = await fetch('/api/events/annotations', {
-            method: 'PUT',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ annotationId, content }),
-        })
-
-        if (!res.ok) {
-            const body = await res.json().catch(() => ({}))
-            throw new Error(body.error || `Failed to edit annotation (${res.status})`)
-        }
-
-        const data = await res.json()
-
-        // Update in state
-        setAnnotations((prev) =>
-            prev.map((a) => (a.id === annotationId ? data.annotation : a))
-        )
-    }, [])
-
-    const deleteAnnotation = useCallback(async (annotationId: string) => {
-        const res = await fetch(`/api/events/annotations?annotationId=${encodeURIComponent(annotationId)}`, {
-            method: 'DELETE',
-        })
-
-        if (!res.ok) {
-            const body = await res.json().catch(() => ({}))
-            throw new Error(body.error || `Failed to delete annotation (${res.status})`)
-        }
-
-        // Remove from state
-        setAnnotations((prev) => prev.filter((a) => a.id !== annotationId))
-    }, [])
-
-    const react = useCallback(async (annotationId: string, emoji: string) => {
-        const res = await fetch('/api/events/annotations/react', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ annotationId, emoji }),
-        })
-
-        if (!res.ok) {
-            const body = await res.json().catch(() => ({}))
-            throw new Error(body.error || `Failed to react (${res.status})`)
-        }
-
-        const data = await res.json()
-
-        // Update in state
-        setAnnotations((prev) =>
-            prev.map((a) => (a.id === annotationId ? data.annotation : a))
-        )
-    }, [])
-
-    return {
-        annotations,
-        isLoading,
-        error,
-        addAnnotation,
-        editAnnotation,
-        deleteAnnotation,
-        react,
-        refresh: fetchAnnotations,
+    if (!res.ok) {
+      const body = await res.json().catch(() => ({}))
+      throw new Error(body.error || `Failed to delete annotation (${res.status})`)
+    }
+
+    // Remove from state
+    setAnnotations((prev) => prev.filter((a) => a.id !== annotationId))
+  }, [])
+
+  const react = useCallback(async (annotationId: string, emoji: string) => {
+    const res = await fetch('/api/events/annotations/react', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ annotationId, emoji }),
+    })
+
+    if (!res.ok) {
+      const body = await res.json().catch(() => ({}))
+      throw new Error(body.error || `Failed to react (${res.status})`)
     }
+
+    const data = await res.json()
+
+    // Update in state
+    setAnnotations((prev) => prev.map((a) => (a.id === annotationId ? data.annotation : a)))
+  }, [])
+
+  return {
+    annotations,
+    isLoading,
+    error,
+    addAnnotation,
+    editAnnotation,
+    deleteAnnotation,
+    react,
+    refresh: fetchAnnotations,
+  }
 }
diff --git a/src/hooks/useUserPreferences.tsx b/src/hooks/useUserPreferences.tsx
index bc3aafbe..b72ba277 100644
--- a/src/hooks/useUserPreferences.tsx
+++ b/src/hooks/useUserPreferences.tsx
@@ -9,14 +9,14 @@ import { DEFAULT_PREFERENCES } from '@/components/settings/UserPreferencesModal'
 // ============================================================================
 
 interface UserPreferencesContextValue {
-    preferences: UserPreferences
-    isLoading: boolean
-    isSaving: boolean
-    error: string | null
-    updatePreferences: (updates: Partial<UserPreferences>) => Promise<void>
-    savePreferences: (prefs: UserPreferences) => Promise<void>
-    resetToDefaults: () => Promise<void>
-    refresh: () => Promise<void>
+  preferences: UserPreferences
+  isLoading: boolean
+  isSaving: boolean
+  error: string | null
+  updatePreferences: (updates: Partial<UserPreferences>) => Promise<void>
+  savePreferences: (prefs: UserPreferences) => Promise<void>
+  resetToDefaults: () => Promise<void>
+  refresh: () => Promise<void>
 }
 
 const UserPreferencesContext = createContext<UserPreferencesContextValue | null>(null)
@@ -32,114 +32,116 @@ const STORAGE_KEY = 'fluxlens-user-preferences'
 // ============================================================================
 
 interface UserPreferencesProviderProps {
-    children: ReactNode
-    userId?: string
+  children: ReactNode
+  userId?: string
 }
 
 export function UserPreferencesProvider({ children, userId }: UserPreferencesProviderProps) {
-    const [preferences, setPreferences] = useState<UserPreferences>(DEFAULT_PREFERENCES)
-    const [isLoading, setIsLoading] = useState(true)
-    const [isSaving, setIsSaving] = useState(false)
-    const [error, setError] = useState<string | null>(null)
-
-    // Load preferences
-    const loadPreferences = useCallback(async () => {
-        setIsLoading(true)
-        setError(null)
-
-        try {
-            // First try to load from localStorage for instant access
-            const localData = localStorage.getItem(STORAGE_KEY)
-            if (localData) {
-                const parsed = JSON.parse(localData) as Partial<UserPreferences>
-                setPreferences({ ...DEFAULT_PREFERENCES, ...parsed })
-            }
-
-            // If user is authenticated, fetch from API
-            if (userId) {
-                const res = await fetch('/api/user/preferences')
-                if (res.ok) {
-                    const data = await res.json()
-                    if (data.preferences) {
-                        const merged = { ...DEFAULT_PREFERENCES, ...data.preferences }
-                        setPreferences(merged)
-                        localStorage.setItem(STORAGE_KEY, JSON.stringify(merged))
-                    }
-                }
-            }
-        } catch (err) {
-            console.error('Failed to load preferences:', err)
-            setError(err instanceof Error ? err.message : 'Failed to load preferences')
-        } finally {
-            setIsLoading(false)
+  const [preferences, setPreferences] = useState<UserPreferences>(DEFAULT_PREFERENCES)
+  const [isLoading, setIsLoading] = useState(true)
+  const [isSaving, setIsSaving] = useState(false)
+  const [error, setError] = useState<string | null>(null)
+
+  // Load preferences
+  const loadPreferences = useCallback(async () => {
+    setIsLoading(true)
+    setError(null)
+
+    try {
+      // First try to load from localStorage for instant access
+      const localData = localStorage.getItem(STORAGE_KEY)
+      if (localData) {
+        const parsed = JSON.parse(localData) as Partial<UserPreferences>
+        setPreferences({ ...DEFAULT_PREFERENCES, ...parsed })
+      }
+
+      // If user is authenticated, fetch from API
+      if (userId) {
+        const res = await fetch('/api/user/preferences')
+        if (res.ok) {
+          const data = await res.json()
+          if (data.preferences) {
+            const merged = { ...DEFAULT_PREFERENCES, ...data.preferences }
+            setPreferences(merged)
+            localStorage.setItem(STORAGE_KEY, JSON.stringify(merged))
+          }
         }
-    }, [userId])
-
-    useEffect(() => {
-        loadPreferences()
-    }, [loadPreferences])
-
-    // Save preferences
-    const savePreferences = useCallback(async (prefs: UserPreferences) => {
-        setIsSaving(true)
-        setError(null)
-
-        try {
-            const withTimestamp = { ...prefs, updatedAt: Date.now() }
-
-            // Save to localStorage immediately
-            localStorage.setItem(STORAGE_KEY, JSON.stringify(withTimestamp))
-            setPreferences(withTimestamp)
-
-            // Sync to API if authenticated
-            if (userId) {
-                const res = await fetch('/api/user/preferences', {
-                    method: 'PUT',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ preferences: withTimestamp }),
-                })
-
-                if (!res.ok) {
-                    const body = await res.json().catch(() => ({}))
-                    throw new Error(body.error || 'Failed to save preferences')
-                }
-            }
-        } catch (err) {
-            console.error('Failed to save preferences:', err)
-            setError(err instanceof Error ? err.message : 'Failed to save preferences')
-            throw err
-        } finally {
-            setIsSaving(false)
-        }
-    }, [userId])
-
-    // Update partial preferences
-    const updatePreferences = useCallback(async (updates: Partial<UserPreferences>) => {
-        const newPrefs = { ...preferences, ...updates }
-        await savePreferences(newPrefs)
-    }, [preferences, savePreferences])
-
-    // Reset to defaults
-    const resetToDefaults = useCallback(async () => {
-        await savePreferences(DEFAULT_PREFERENCES)
-    }, [savePreferences])
-
-    const value: UserPreferencesContextValue = {
-        preferences,
-        isLoading,
-        isSaving,
-        error,
-        updatePreferences,
-        savePreferences,
-        resetToDefaults,
-        refresh: loadPreferences,
+      }
+    } catch (err) {
+      console.error('Failed to load preferences:', err)
+      setError(err instanceof Error ? err.message : 'Failed to load preferences')
+    } finally {
+      setIsLoading(false)
     }
-
-    return (
-        <UserPreferencesContext.Provider value={value}>
-            {children}
-        </UserPreferencesContext.Provider>
-    )
+  }, [userId])
+
+  useEffect(() => {
+    loadPreferences()
+  }, [loadPreferences])
+
+  // Save preferences
+  const savePreferences = useCallback(
+    async (prefs: UserPreferences) => {
+      setIsSaving(true)
+      setError(null)
+
+      try {
+        const withTimestamp = { ...prefs, updatedAt: Date.now() }
+
+        // Save to localStorage immediately
+        localStorage.setItem(STORAGE_KEY, JSON.stringify(withTimestamp))
+        setPreferences(withTimestamp)
+
+        // Sync to API if authenticated
+        if (userId) {
+          const res = await fetch('/api/user/preferences', {
+            method: 'PUT',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ preferences: withTimestamp }),
+          })
+
+          if (!res.ok) {
+            const body = await res.json().catch(() => ({}))
+            throw new Error(body.error || 'Failed to save preferences')
+          }
+        }
+      } catch (err) {
+        console.error('Failed to save preferences:', err)
+        setError(err instanceof Error ? err.message : 'Failed to save preferences')
+        throw err
+      } finally {
+        setIsSaving(false)
+      }
+    },
+    [userId]
+  )
+
+  // Update partial preferences
+  const updatePreferences = useCallback(
+    async (updates: Partial<UserPreferences>) => {
+      const newPrefs = { ...preferences, ...updates }
+      await savePreferences(newPrefs)
+    },
+    [preferences, savePreferences]
+  )
+
+  // Reset to defaults
+  const resetToDefaults = useCallback(async () => {
+    await savePreferences(DEFAULT_PREFERENCES)
+  }, [savePreferences])
+
+  const value: UserPreferencesContextValue = {
+    preferences,
+    isLoading,
+    isSaving,
+    error,
+    updatePreferences,
+    savePreferences,
+    resetToDefaults,
+    refresh: loadPreferences,
+  }
+
+  return <UserPreferencesContext.Provider value={value}>{children}</UserPreferencesContext.Provider>
 }
 
 // ============================================================================
@@ -147,15 +149,15 @@ export function UserPreferencesProvider({ children, userId }: UserPreferencesPro
 // ============================================================================
 
 export function useUserPreferences(): UserPreferencesContextValue {
-    const context = useContext(UserPreferencesContext)
-    if (!context) {
-        throw new Error('useUserPreferences must be used within a UserPreferencesProvider')
-    }
-    return context
+  const context = useContext(UserPreferencesContext)
+  if (!context) {
+    throw new Error('useUserPreferences must be used within a UserPreferencesProvider')
+  }
+  return context
 }
 
 export function useOptionalUserPreferences(): UserPreferencesContextValue | null {
-    return useContext(UserPreferencesContext)
+  return useContext(UserPreferencesContext)
 }
 
 // ============================================================================
@@ -163,41 +165,41 @@ export function useOptionalUserPreferences(): UserPreferencesContextValue | null
 // ============================================================================
 
 export function useLocalPreferences() {
-    const [preferences, setPreferences] = useState<UserPreferences>(DEFAULT_PREFERENCES)
-    const [isLoading, setIsLoading] = useState(true)
-
-    useEffect(() => {
-        try {
-            const stored = localStorage.getItem(STORAGE_KEY)
-            if (stored) {
-                setPreferences({ ...DEFAULT_PREFERENCES, ...JSON.parse(stored) })
-            }
-        } catch (err) {
-            console.error('Failed to load local preferences:', err)
-        } finally {
-            setIsLoading(false)
-        }
-    }, [])
-
-    const updatePreferences = useCallback((updates: Partial<UserPreferences>) => {
-        setPreferences((prev) => {
-            const newPrefs = { ...prev, ...updates, updatedAt: Date.now() }
-            localStorage.setItem(STORAGE_KEY, JSON.stringify(newPrefs))
-            return newPrefs
-        })
-    }, [])
-
-    const resetToDefaults = useCallback(() => {
-        localStorage.setItem(STORAGE_KEY, JSON.stringify(DEFAULT_PREFERENCES))
-        setPreferences(DEFAULT_PREFERENCES)
-    }, [])
-
-    return {
-        preferences,
-        isLoading,
-        updatePreferences,
-        resetToDefaults,
+  const [preferences, setPreferences] = useState<UserPreferences>(DEFAULT_PREFERENCES)
+  const [isLoading, setIsLoading] = useState(true)
+
+  useEffect(() => {
+    try {
+      const stored = localStorage.getItem(STORAGE_KEY)
+      if (stored) {
+        setPreferences({ ...DEFAULT_PREFERENCES, ...JSON.parse(stored) })
+      }
+    } catch (err) {
+      console.error('Failed to load local preferences:', err)
+    } finally {
+      setIsLoading(false)
     }
+  }, [])
+
+  const updatePreferences = useCallback((updates: Partial<UserPreferences>) => {
+    setPreferences((prev) => {
+      const newPrefs = { ...prev, ...updates, updatedAt: Date.now() }
+      localStorage.setItem(STORAGE_KEY, JSON.stringify(newPrefs))
+      return newPrefs
+    })
+  }, [])
+
+  const resetToDefaults = useCallback(() => {
+    localStorage.setItem(STORAGE_KEY, JSON.stringify(DEFAULT_PREFERENCES))
+    setPreferences(DEFAULT_PREFERENCES)
+  }, [])
+
+  return {
+    preferences,
+    isLoading,
+    updatePreferences,
+    resetToDefaults,
+  }
 }
 
 // ============================================================================
@@ -208,47 +210,47 @@ export function useLocalPreferences() {
  * Get a single preference value
  */
 export function usePreference<K extends keyof UserPreferences>(key: K): UserPreferences[K] {
-    const { preferences } = useUserPreferences()
-    return preferences[key]
+  const { preferences } = useUserPreferences()
+  return preferences[key]
 }
 
 /**
  * Apply theme preference to document
  */
 export function useApplyTheme() {
-    const { preferences } = useUserPreferences()
-
-    useEffect(() => {
-        const theme = preferences.theme
-        const root = document.documentElement
-
-        if (theme === 'dark') {
-            root.classList.add('dark')
-        } else if (theme === 'light') {
-            root.classList.remove('dark')
-        } else {
-            // System preference
-            const systemDark = window.matchMedia('(prefers-color-scheme: dark)').matches
-            if (systemDark) {
-                root.classList.add('dark')
-            } else {
-                root.classList.remove('dark')
-            }
-        }
-    }, [preferences.theme])
+  const { preferences } = useUserPreferences()
+
+  useEffect(() => {
+    const theme = preferences.theme
+    const root = document.documentElement
+
+    if (theme === 'dark') {
+      root.classList.add('dark')
+    } else if (theme === 'light') {
+      root.classList.remove('dark')
+    } else {
+      // System preference
+      const systemDark = window.matchMedia('(prefers-color-scheme: dark)').matches
+      if (systemDark) {
+        root.classList.add('dark')
+      } else {
+        root.classList.remove('dark')
+      }
+    }
+  }, [preferences.theme])
 }
 
 /**
  * Auto-refresh hook based on preference
  */
 export function useAutoRefresh(refreshFn: () => void) {
-    const { preferences } = useUserPreferences()
+  const { preferences } = useUserPreferences()
 
-    useEffect(() => {
-        const interval = preferences.autoRefreshInterval
-        if (interval <= 0) return
+  useEffect(() => {
+    const interval = preferences.autoRefreshInterval
+    if (interval <= 0) return
 
-        const timer = setInterval(refreshFn, interval * 1000)
-        return () => clearInterval(timer)
-    }, [preferences.autoRefreshInterval, refreshFn])
+    const timer = setInterval(refreshFn, interval * 1000)
+    return () => clearInterval(timer)
+  }, [preferences.autoRefreshInterval, refreshFn])
 }
diff --git a/src/hooks/v102.ts b/src/hooks/v102.ts
index a0fab495..90202e31 100644
--- a/src/hooks/v102.ts
+++ b/src/hooks/v102.ts
@@ -3,12 +3,12 @@
 
 export { useEventAnnotations } from './useEventAnnotations'
 export {
-    useLiveUpdates,
-    useWSMessageType,
-    useSimulatedLiveUpdates,
-    useWSStore,
-    LiveIndicator,
-    getWSManager,
-    type WSMessage,
-    type ConnectionState,
+  useLiveUpdates,
+  useWSMessageType,
+  useSimulatedLiveUpdates,
+  useWSStore,
+  LiveIndicator,
+  getWSManager,
+  type WSMessage,
+  type ConnectionState,
 } from '@/lib/realtime/websocket'
diff --git a/src/lib/db/repository.ts b/src/lib/db/repository.ts
index 21e3021a..b64db316 100644
--- a/src/lib/db/repository.ts
+++ b/src/lib/db/repository.ts
@@ -1150,7 +1150,7 @@ export class FileRepository implements Repository {
 }
 
 class PrismaRepository implements Repository {
-  constructor(private readonly client: PrismaClientLike) { }
+  constructor(private readonly client: PrismaClientLike) {}
 
   async getLatestOrganizationSnapshot(orgId: OrgId): Promise<FluxDataResponse | null> {
     // Supabase stores the snapshot; use it when configured.
diff --git a/src/lib/forecastModel.ts b/src/lib/forecastModel.ts
index 775c2712..58a375d2 100644
--- a/src/lib/forecastModel.ts
+++ b/src/lib/forecastModel.ts
@@ -353,11 +353,13 @@ function arimaSurrogateForecast(
   const meanDiff = diffs.reduce((s, v) => s + v, 0) / Math.max(diffs.length, 1)
 
   // Simple AR(1) on diffs
-  const phi =
-    diffs.length > 1
-      ? diffs.slice(1).reduce((s, v, idx) => s + v * diffs[idx], 0) /
-        diffs.slice(0, -1).reduce((s, v) => s + v * v, 0)
-      : 0
+  let phi = 0
+  if (diffs.length > 1) {
+    const denominator = diffs.slice(0, -1).reduce((s, v) => s + v * v, 0)
+    if (denominator > 0) {
+      phi = diffs.slice(1).reduce((s, v, idx) => s + v * diffs[idx], 0) / denominator
+    }
+  }
 
   const residuals = diffs.slice(1).map((v, idx) => v - phi * diffs[idx])
   const residualStd = standardDeviation(residuals) || 1
diff --git a/src/lib/integrations/adapters/resend.ts b/src/lib/integrations/adapters/resend.ts
index 76200bf3..3f90beb7 100644
--- a/src/lib/integrations/adapters/resend.ts
+++ b/src/lib/integrations/adapters/resend.ts
@@ -2,80 +2,86 @@ import { NextRequest } from 'next/server'
 import { WebhookAdapter, StandardizedEventPayload } from './types'
 
 export const resendAdapter: WebhookAdapter = {
-    verify(req: NextRequest) {
-        // Security: Check for a secret query parameter
-        // URL: /api/webhooks/resend?secret=YOUR_SECRET
-        const secret = process.env.RESEND_WEBHOOK_SECRET
-        const suppliedSecret = req.nextUrl.searchParams.get('secret')
+  verify(req: NextRequest) {
+    // Security: Check for a secret query parameter
+    // URL: /api/webhooks/resend?secret=YOUR_SECRET
+    const secret = process.env.RESEND_WEBHOOK_SECRET
+    const suppliedSecret = req.nextUrl.searchParams.get('secret')
 
-        if (secret) {
-            if (suppliedSecret !== secret) {
-                console.warn('[ResendWebhook] Invalid secret provided')
-                return false
-            }
-            return true
-        }
+    if (secret) {
+      if (suppliedSecret !== secret) {
+        console.warn('[ResendWebhook] Invalid secret provided')
+        return false
+      }
+      return true
+    }
 
-        // If no secret configured in Env, warn but allow in Development
-        if (process.env.NODE_ENV === 'development') {
-            console.warn('[ResendWebhook] No RESEND_WEBHOOK_SECRET configured, allowing request')
-            return true
-        }
+    // If no secret configured in Env, warn but allow in Development
+    if (process.env.NODE_ENV === 'development') {
+      console.warn('[ResendWebhook] No RESEND_WEBHOOK_SECRET configured, allowing request')
+      return true
+    }
 
-        // In production, require a secret
-        console.error('[ResendWebhook] RESEND_WEBHOOK_SECRET is not configured')
-        return false
-    },
+    // In production, require a secret
+    console.error('[ResendWebhook] RESEND_WEBHOOK_SECRET is not configured')
+    return false
+  },
 
-    async resolveOrganizationId(body: any): Promise<string | null> {
-        // Expected Payload: { to: "slug@domain.com", ... }
-        const to = Array.isArray(body.to) ? body.to[0] : body.to
-        if (!to) return process.env.NEXT_PUBLIC_DEFAULT_ORG_ID || 'FluxLensDemo'
+  async resolveOrganizationId(body: any): Promise<string | null> {
+    // Expected Payload: { to: "slug@domain.com", ... }
+    const to = Array.isArray(body.to) ? body.to[0] : body.to
+    if (!to) return process.env.NEXT_PUBLIC_DEFAULT_ORG_ID || 'FluxLensDemo'
 
-        // 1. Try to extract specific org slug from email address (custom domain flow)
-        // Example: fluxlens-demo@inbound.fluxlens.ai -> fluxlens-demo
-        const match = to.match(/^([a-zA-Z0-9_\-]+)@/)
-        if (match && match[1] && !['inbound', 'fluxlensai', 'fluxlens', 'ingest', 'incoming', 'contact', 'support'].includes(match[1])) {
-            return match[1]
-        }
+    // 1. Try to extract specific org slug from email address (custom domain flow)
+    // Example: fluxlens-demo@inbound.fluxlens.ai -> fluxlens-demo
+    const match = to.match(/^([a-zA-Z0-9_\-]+)@/)
+    if (
+      match &&
+      match[1] &&
+      !['inbound', 'fluxlensai', 'fluxlens', 'ingest', 'incoming', 'contact', 'support'].includes(
+        match[1]
+      )
+    ) {
+      return match[1]
+    }
 
-        // 2. Fallback: If sent to "fluxlensai@gmail.com" or generic "inbound@", 
-        // we assign it to the default/demo org or a specific Admin Org.
-        if (process.env.NEXT_PUBLIC_DEFAULT_ORG_ID) {
-            return process.env.NEXT_PUBLIC_DEFAULT_ORG_ID
-        }
+    // 2. Fallback: If sent to "fluxlensai@gmail.com" or generic "inbound@",
+    // we assign it to the default/demo org or a specific Admin Org.
+    if (process.env.NEXT_PUBLIC_DEFAULT_ORG_ID) {
+      return process.env.NEXT_PUBLIC_DEFAULT_ORG_ID
+    }
 
-        // 3. Last Result: Use the "Demo" org if configured
-        return process.env.FLUXLENS_ORG_ID || 'FluxLensDemo'
-    },
+    // 3. Last Result: Use the "Demo" org if configured
+    return process.env.FLUXLENS_ORG_ID || 'FluxLensDemo'
+  },
 
-    async parse(body: any): Promise<StandardizedEventPayload[]> {
-        // Resend Inbound Email Payload
-        const { from, to, subject, text, html, headers, attachments } = body
+  async parse(body: any): Promise<StandardizedEventPayload[]> {
+    // Resend Inbound Email Payload
+    const { from, to, subject, text, html, headers, attachments } = body
 
-        if (!from || !to) {
-            if (body.type === 'email.delivery' || body.type === 'email.bounce') {
-                // Handle delivery events if Resend sends them to the same webhook
-                // For now, we ignore them or log them as system events
-                return []
-            }
-            return []
-        }
+    if (!from || !to) {
+      if (body.type === 'email.delivery' || body.type === 'email.bounce') {
+        // Handle delivery events if Resend sends them to the same webhook
+        // For now, we ignore them or log them as system events
+        return []
+      }
+      return []
+    }
 
-        return [
-            {
-                type: 'email.received',
-                payload: {
-                    from,
-                    to,
-                    subject,
-                    text,
-                    html,
-                    headers,
-                    hasAttachments: attachments && attachments.length > 0,
-                },
-                createdAt: new Date().toISOString(),
-            },
-        ]
-    },
+    return [
+      {
+        type: 'email.received',
+        payload: {
+          from,
+          to,
+          subject,
+          text,
+          html,
+          headers,
+          hasAttachments: attachments && attachments.length > 0,
+        },
+        createdAt: new Date().toISOString(),
+      },
+    ]
+  },
 }
diff --git a/src/lib/realtime/websocket.tsx b/src/lib/realtime/websocket.tsx
index 78604369..16b9d77d 100644
--- a/src/lib/realtime/websocket.tsx
+++ b/src/lib/realtime/websocket.tsx
@@ -8,17 +8,23 @@ import { create } from 'zustand'
 // ============================================================================
 
 export interface WSMessage {
-    type: 'health_update' | 'event_new' | 'event_resolved' | 'insight_new' | 'metric_update' | 'connection_status'
-    payload: Record<string, unknown>
-    timestamp: number
-    orgId?: string
+  type:
+    | 'health_update'
+    | 'event_new'
+    | 'event_resolved'
+    | 'insight_new'
+    | 'metric_update'
+    | 'connection_status'
+  payload: Record<string, unknown>
+  timestamp: number
+  orgId?: string
 }
 
 export interface ConnectionState {
-    status: 'connecting' | 'connected' | 'disconnected' | 'error'
-    lastConnectedAt: number | null
-    reconnectAttempts: number
-    error: string | null
+  status: 'connecting' | 'connected' | 'disconnected' | 'error'
+  lastConnectedAt: number | null
+  reconnectAttempts: number
+  error: string | null
 }
 
 // ============================================================================
@@ -26,33 +32,33 @@ export interface ConnectionState {
 // ============================================================================
 
 interface WSStore {
-    connectionState: ConnectionState
-    lastMessage: WSMessage | null
-    messageQueue: WSMessage[]
-    setConnectionState: (state: Partial<ConnectionState>) => void
-    addMessage: (message: WSMessage) => void
-    clearQueue: () => void
+  connectionState: ConnectionState
+  lastMessage: WSMessage | null
+  messageQueue: WSMessage[]
+  setConnectionState: (state: Partial<ConnectionState>) => void
+  addMessage: (message: WSMessage) => void
+  clearQueue: () => void
 }
 
 export const useWSStore = create<WSStore>((set) => ({
-    connectionState: {
-        status: 'disconnected',
-        lastConnectedAt: null,
-        reconnectAttempts: 0,
-        error: null,
-    },
-    lastMessage: null,
-    messageQueue: [],
-    setConnectionState: (state) =>
-        set((s) => ({
-            connectionState: { ...s.connectionState, ...state },
-        })),
-    addMessage: (message) =>
-        set((s) => ({
-            lastMessage: message,
-            messageQueue: [...s.messageQueue.slice(-49), message], // Keep last 50 messages
-        })),
-    clearQueue: () => set({ messageQueue: [] }),
+  connectionState: {
+    status: 'disconnected',
+    lastConnectedAt: null,
+    reconnectAttempts: 0,
+    error: null,
+  },
+  lastMessage: null,
+  messageQueue: [],
+  setConnectionState: (state) =>
+    set((s) => ({
+      connectionState: { ...s.connectionState, ...state },
+    })),
+  addMessage: (message) =>
+    set((s) => ({
+      lastMessage: message,
+      messageQueue: [...s.messageQueue.slice(-49), message], // Keep last 50 messages
+    })),
+  clearQueue: () => set({ messageQueue: [] }),
 }))
 
 // ============================================================================
@@ -60,141 +66,146 @@ export const useWSStore = create<WSStore>((set) => ({
 // ============================================================================
 
 class WebSocketManager {
-    private ws: WebSocket | null = null
-    private url: string
-    private reconnectTimeout: NodeJS.Timeout | null = null
-    private heartbeatInterval: NodeJS.Timeout | null = null
-    private maxReconnectAttempts = 10
-    private reconnectDelay = 1000
-    private messageHandlers: Set<(message: WSMessage) => void> = new Set()
-
-    constructor(url: string) {
-        this.url = url
+  private ws: WebSocket | null = null
+  private url: string
+  private reconnectTimeout: NodeJS.Timeout | null = null
+  private heartbeatInterval: NodeJS.Timeout | null = null
+  private maxReconnectAttempts = 10
+  private reconnectDelay = 1000
+  private messageHandlers: Set<(message: WSMessage) => void> = new Set()
+
+  constructor(url: string) {
+    this.url = url
+  }
+
+  connect() {
+    const store = useWSStore.getState()
+
+    if (this.ws?.readyState === WebSocket.OPEN) {
+      return
     }
 
-    connect() {
-        const store = useWSStore.getState()
+    store.setConnectionState({ status: 'connecting', error: null })
 
-        if (this.ws?.readyState === WebSocket.OPEN) {
-            return
-        }
+    try {
+      this.ws = new WebSocket(this.url)
 
-        store.setConnectionState({ status: 'connecting', error: null })
+      this.ws.onopen = () => {
+        store.setConnectionState({
+          status: 'connected',
+          lastConnectedAt: Date.now(),
+          reconnectAttempts: 0,
+          error: null,
+        })
+        this.startHeartbeat()
+        console.log('[WebSocket] Connected to FluxLens live updates')
+      }
 
+      this.ws.onmessage = (event) => {
         try {
-            this.ws = new WebSocket(this.url)
-
-            this.ws.onopen = () => {
-                store.setConnectionState({
-                    status: 'connected',
-                    lastConnectedAt: Date.now(),
-                    reconnectAttempts: 0,
-                    error: null,
-                })
-                this.startHeartbeat()
-                console.log('[WebSocket] Connected to FluxLens live updates')
-            }
-
-            this.ws.onmessage = (event) => {
-                try {
-                    const message = JSON.parse(event.data) as WSMessage
-                    store.addMessage(message)
-                    this.messageHandlers.forEach((handler) => handler(message))
-                } catch (error) {
-                    console.error('[WebSocket] Failed to parse message:', error)
-                }
-            }
-
-            this.ws.onclose = (event) => {
-                store.setConnectionState({ status: 'disconnected' })
-                this.stopHeartbeat()
-
-                if (!event.wasClean && store.connectionState.reconnectAttempts < this.maxReconnectAttempts) {
-                    this.scheduleReconnect()
-                }
-            }
-
-            this.ws.onerror = (error) => {
-                console.error('[WebSocket] Error:', error)
-                store.setConnectionState({
-                    status: 'error',
-                    error: 'Connection failed',
-                })
-            }
+          const message = JSON.parse(event.data) as WSMessage
+          store.addMessage(message)
+          this.messageHandlers.forEach((handler) => handler(message))
         } catch (error) {
-            console.error('[WebSocket] Failed to create connection:', error)
-            store.setConnectionState({
-                status: 'error',
-                error: error instanceof Error ? error.message : 'Failed to connect',
-            })
+          console.error('[WebSocket] Failed to parse message:', error)
         }
-    }
+      }
 
-    disconnect() {
+      this.ws.onclose = (event) => {
+        store.setConnectionState({ status: 'disconnected' })
         this.stopHeartbeat()
-        if (this.reconnectTimeout) {
-            clearTimeout(this.reconnectTimeout)
-            this.reconnectTimeout = null
-        }
-        if (this.ws) {
-            this.ws.close(1000, 'Client disconnect')
-            this.ws = null
-        }
-        useWSStore.getState().setConnectionState({
-            status: 'disconnected',
-            reconnectAttempts: 0,
-        })
-    }
 
-    private scheduleReconnect() {
-        const store = useWSStore.getState()
-        const delay = Math.min(
-            this.reconnectDelay * Math.pow(2, store.connectionState.reconnectAttempts),
-            30000
-        )
+        if (
+          !event.wasClean &&
+          store.connectionState.reconnectAttempts < this.maxReconnectAttempts
+        ) {
+          this.scheduleReconnect()
+        }
+      }
 
+      this.ws.onerror = (error) => {
+        console.error('[WebSocket] Error:', error)
         store.setConnectionState({
-            reconnectAttempts: store.connectionState.reconnectAttempts + 1,
+          status: 'error',
+          error: 'Connection failed',
         })
-
-        console.log(`[WebSocket] Reconnecting in ${delay}ms (attempt ${store.connectionState.reconnectAttempts})`)
-
-        this.reconnectTimeout = setTimeout(() => {
-            this.connect()
-        }, delay)
+      }
+    } catch (error) {
+      console.error('[WebSocket] Failed to create connection:', error)
+      store.setConnectionState({
+        status: 'error',
+        error: error instanceof Error ? error.message : 'Failed to connect',
+      })
     }
+  }
 
-    private startHeartbeat() {
-        this.heartbeatInterval = setInterval(() => {
-            if (this.ws?.readyState === WebSocket.OPEN) {
-                this.ws.send(JSON.stringify({ type: 'ping', timestamp: Date.now() }))
-            }
-        }, 30000)
+  disconnect() {
+    this.stopHeartbeat()
+    if (this.reconnectTimeout) {
+      clearTimeout(this.reconnectTimeout)
+      this.reconnectTimeout = null
     }
-
-    private stopHeartbeat() {
-        if (this.heartbeatInterval) {
-            clearInterval(this.heartbeatInterval)
-            this.heartbeatInterval = null
-        }
+    if (this.ws) {
+      this.ws.close(1000, 'Client disconnect')
+      this.ws = null
     }
+    useWSStore.getState().setConnectionState({
+      status: 'disconnected',
+      reconnectAttempts: 0,
+    })
+  }
+
+  private scheduleReconnect() {
+    const store = useWSStore.getState()
+    const delay = Math.min(
+      this.reconnectDelay * Math.pow(2, store.connectionState.reconnectAttempts),
+      30000
+    )
 
-    send(message: Omit<WSMessage, 'timestamp'>) {
-        if (this.ws?.readyState === WebSocket.OPEN) {
-            this.ws.send(JSON.stringify({ ...message, timestamp: Date.now() }))
-        } else {
-            console.warn('[WebSocket] Cannot send message - not connected')
-        }
-    }
+    store.setConnectionState({
+      reconnectAttempts: store.connectionState.reconnectAttempts + 1,
+    })
 
-    subscribe(handler: (message: WSMessage) => void) {
-        this.messageHandlers.add(handler)
-        return () => this.messageHandlers.delete(handler)
+    console.log(
+      `[WebSocket] Reconnecting in ${delay}ms (attempt ${store.connectionState.reconnectAttempts})`
+    )
+
+    this.reconnectTimeout = setTimeout(() => {
+      this.connect()
+    }, delay)
+  }
+
+  private startHeartbeat() {
+    this.heartbeatInterval = setInterval(() => {
+      if (this.ws?.readyState === WebSocket.OPEN) {
+        this.ws.send(JSON.stringify({ type: 'ping', timestamp: Date.now() }))
+      }
+    }, 30000)
+  }
+
+  private stopHeartbeat() {
+    if (this.heartbeatInterval) {
+      clearInterval(this.heartbeatInterval)
+      this.heartbeatInterval = null
     }
+  }
 
-    getReadyState(): number | null {
-        return this.ws?.readyState ?? null
+  send(message: Omit<WSMessage, 'timestamp'>) {
+    if (this.ws?.readyState === WebSocket.OPEN) {
+      this.ws.send(JSON.stringify({ ...message, timestamp: Date.now() }))
+    } else {
+      console.warn('[WebSocket] Cannot send message - not connected')
     }
+  }
+
+  subscribe(handler: (message: WSMessage) => void) {
+    this.messageHandlers.add(handler)
+    return () => this.messageHandlers.delete(handler)
+  }
+
+  getReadyState(): number | null {
+    return this.ws?.readyState ?? null
+  }
 }
 
 // ============================================================================
@@ -204,13 +215,13 @@ class WebSocketManager {
 let wsManager: WebSocketManager | null = null
 
 export function getWSManager(url?: string): WebSocketManager {
-    if (!wsManager && url) {
-        wsManager = new WebSocketManager(url)
-    }
-    if (!wsManager) {
-        throw new Error('WebSocket manager not initialized. Provide a URL on first call.')
-    }
-    return wsManager
+  if (!wsManager && url) {
+    wsManager = new WebSocketManager(url)
+  }
+  if (!wsManager) {
+    throw new Error('WebSocket manager not initialized. Provide a URL on first call.')
+  }
+  return wsManager
 }
 
 // ============================================================================
@@ -221,84 +232,84 @@ export function getWSManager(url?: string): WebSocketManager {
  * Hook to connect to WebSocket and manage connection lifecycle
  */
 export function useLiveUpdates(options?: {
-    url?: string
-    autoConnect?: boolean
-    onMessage?: (message: WSMessage) => void
+  url?: string
+  autoConnect?: boolean
+  onMessage?: (message: WSMessage) => void
 }) {
-    const {
-        url = process.env.NEXT_PUBLIC_WS_URL || 'wss://api.fluxlensai.com/ws/live',
-        autoConnect = true,
-        onMessage,
-    } = options || {}
+  const {
+    url = process.env.NEXT_PUBLIC_WS_URL || 'wss://api.fluxlensai.com/ws/live',
+    autoConnect = true,
+    onMessage,
+  } = options || {}
 
-    const connectionState = useWSStore((s) => s.connectionState)
-    const lastMessage = useWSStore((s) => s.lastMessage)
-    const managerRef = useRef<WebSocketManager | null>(null)
+  const connectionState = useWSStore((s) => s.connectionState)
+  const lastMessage = useWSStore((s) => s.lastMessage)
+  const managerRef = useRef<WebSocketManager | null>(null)
 
-    useEffect(() => {
-        if (typeof window === 'undefined') return
+  useEffect(() => {
+    if (typeof window === 'undefined') return
 
-        managerRef.current = getWSManager(url)
+    managerRef.current = getWSManager(url)
 
-        if (autoConnect) {
-            managerRef.current.connect()
-        }
+    if (autoConnect) {
+      managerRef.current.connect()
+    }
 
-        const unsubscribe = onMessage ? managerRef.current.subscribe(onMessage) : undefined
+    const unsubscribe = onMessage ? managerRef.current.subscribe(onMessage) : undefined
 
-        return () => {
-            unsubscribe?.()
-        }
-    }, [url, autoConnect, onMessage])
-
-    const connect = useCallback(() => {
-        managerRef.current?.connect()
-    }, [])
-
-    const disconnect = useCallback(() => {
-        managerRef.current?.disconnect()
-    }, [])
-
-    const send = useCallback((message: Omit<WSMessage, 'timestamp'>) => {
-        managerRef.current?.send(message)
-    }, [])
-
-    return {
-        connectionState,
-        lastMessage,
-        connect,
-        disconnect,
-        send,
-        isConnected: connectionState.status === 'connected',
+    return () => {
+      unsubscribe?.()
     }
+  }, [url, autoConnect, onMessage])
+
+  const connect = useCallback(() => {
+    managerRef.current?.connect()
+  }, [])
+
+  const disconnect = useCallback(() => {
+    managerRef.current?.disconnect()
+  }, [])
+
+  const send = useCallback((message: Omit<WSMessage, 'timestamp'>) => {
+    managerRef.current?.send(message)
+  }, [])
+
+  return {
+    connectionState,
+    lastMessage,
+    connect,
+    disconnect,
+    send,
+    isConnected: connectionState.status === 'connected',
+  }
 }
 
 /**
  * Hook to subscribe to specific message types
  */
 export function useWSMessageType<T extends WSMessage['type']>(
-    type: T,
-    handler: (payload: Record<string, unknown>) => void
+  type: T,
+  handler: (payload: Record<string, unknown>) => void
 ) {
-    const handlerRef = useRef(handler)
-    useEffect(() => {
-        handlerRef.current = handler
-    }, [handler])
-
-    useEffect(() => {
-        const manager = wsManager
-        if (!manager) return
-
-        const unsubscribe = manager.subscribe((message) => {
-            if (message.type === type) {
-                handlerRef.current(message.payload)
-            }
-        })
-
-        return () => {
-            unsubscribe()
-        }
-    }, [type])
+  const handlerRef = useRef(handler)
+  useEffect(() => {
+    handlerRef.current = handler
+  }, [handler])
+
+  useEffect(() => {
+    const manager = wsManager
+    if (!manager) return
+
+    const unsubscribe = manager.subscribe((message) => {
+      if (message.type === type) {
+        handlerRef.current(message.payload)
+      }
+    })
+
+    return () => {
+      unsubscribe()
+    }
+  }, [type])
 }
 
 // ============================================================================
@@ -306,71 +317,69 @@ export function useWSMessageType<T extends WSMessage['type']>(
 // ============================================================================
 
 interface LiveIndicatorProps {
-    showDetails?: boolean
-    className?: string
+  showDetails?: boolean
+  className?: string
 }
 
 export function LiveIndicator({ showDetails = false, className }: LiveIndicatorProps) {
-    const connectionState = useWSStore((s) => s.connectionState)
-    const [pulseKey, setPulseKey] = useState(0)
-
-    // Pulse animation on each new message
-    const lastMessage = useWSStore((s) => s.lastMessage)
-    useEffect(() => {
-        if (lastMessage) {
-            setPulseKey((k) => k + 1)
-        }
-    }, [lastMessage])
-
-    const statusConfig = {
-        connected: {
-            color: 'bg-[#10B981]',
-            ringColor: 'ring-[#10B981]/30',
-            text: 'Live',
-            textColor: 'text-[#10B981]',
-        },
-        connecting: {
-            color: 'bg-[#F59E0B]',
-            ringColor: 'ring-[#F59E0B]/30',
-            text: 'Connecting...',
-            textColor: 'text-[#F59E0B]',
-        },
-        disconnected: {
-            color: 'bg-[#9CA3AF]',
-            ringColor: 'ring-[#9CA3AF]/30',
-            text: 'Offline',
-            textColor: 'text-[#9CA3AF]',
-        },
-        error: {
-            color: 'bg-[#EF4444]',
-            ringColor: 'ring-[#EF4444]/30',
-            text: 'Error',
-            textColor: 'text-[#EF4444]',
-        },
+  const connectionState = useWSStore((s) => s.connectionState)
+  const [pulseKey, setPulseKey] = useState(0)
+
+  // Pulse animation on each new message
+  const lastMessage = useWSStore((s) => s.lastMessage)
+  useEffect(() => {
+    if (lastMessage) {
+      setPulseKey((k) => k + 1)
     }
-
-    const config = statusConfig[connectionState.status]
-
-    return (
-        <div className={`inline-flex items-center gap-2 ${className || ''}`}>
-            <span className="relative flex h-2.5 w-2.5">
-                {connectionState.status === 'connected' && (
-                    <span
-                        key={pulseKey}
-                        className={`absolute inline-flex h-full w-full animate-ping rounded-full ${config.color} opacity-75`}
-                    />
-                )}
-                <span
-                    className={`relative inline-flex h-2.5 w-2.5 rounded-full ${config.color} ring-2 ${config.ringColor}`}
-                />
-            </span>
-            {showDetails && (
-                <span className={`text-xs font-medium ${config.textColor}`}>
-                    {config.text}
-                </span>
-            )}
-        </div>
-    )
+  }, [lastMessage])
+
+  const statusConfig = {
+    connected: {
+      color: 'bg-[#10B981]',
+      ringColor: 'ring-[#10B981]/30',
+      text: 'Live',
+      textColor: 'text-[#10B981]',
+    },
+    connecting: {
+      color: 'bg-[#F59E0B]',
+      ringColor: 'ring-[#F59E0B]/30',
+      text: 'Connecting...',
+      textColor: 'text-[#F59E0B]',
+    },
+    disconnected: {
+      color: 'bg-[#9CA3AF]',
+      ringColor: 'ring-[#9CA3AF]/30',
+      text: 'Offline',
+      textColor: 'text-[#9CA3AF]',
+    },
+    error: {
+      color: 'bg-[#EF4444]',
+      ringColor: 'ring-[#EF4444]/30',
+      text: 'Error',
+      textColor: 'text-[#EF4444]',
+    },
+  }
+
+  const config = statusConfig[connectionState.status]
+
+  return (
+    <div className={`inline-flex items-center gap-2 ${className || ''}`}>
+      <span className="relative flex h-2.5 w-2.5">
+        {connectionState.status === 'connected' && (
+          <span
+            key={pulseKey}
+            className={`absolute inline-flex h-full w-full animate-ping rounded-full ${config.color} opacity-75`}
+          />
+        )}
+        <span
+          className={`relative inline-flex h-2.5 w-2.5 rounded-full ${config.color} ring-2 ${config.ringColor}`}
+        />
+      </span>
+      {showDetails && (
+        <span className={`text-xs font-medium ${config.textColor}`}>{config.text}</span>
+      )}
+    </div>
+  )
 }
 
 // ============================================================================
@@ -378,63 +387,63 @@ export function LiveIndicator({ showDetails = false, className }: LiveIndicatorP
 // ============================================================================
 
 export function useSimulatedLiveUpdates(options?: { interval?: number; enabled?: boolean }) {
-    const { interval = 5000, enabled = process.env.NODE_ENV === 'development' } = options || {}
-    const { addMessage, setConnectionState } = useWSStore()
-
-    useEffect(() => {
-        if (!enabled) return
-
-        // Simulate connection
-        setConnectionState({ status: 'connected', lastConnectedAt: Date.now() })
-
-        const mockMessages: WSMessage[] = [
-            {
-                type: 'health_update',
-                payload: { overall: 72, trend: 'improving', delta: 2.5 },
-                timestamp: Date.now(),
-            },
-            {
-                type: 'event_new',
-                payload: {
-                    id: 'evt-123',
-                    title: 'Response latency spike detected',
-                    department: 'Engineering',
-                    severity: 'high',
-                },
-                timestamp: Date.now(),
-            },
-            {
-                type: 'insight_new',
-                payload: {
-                    type: 'observation',
-                    message: 'Handoff efficiency improved 8% this week',
-                },
-                timestamp: Date.now(),
-            },
-            {
-                type: 'metric_update',
-                payload: {
-                    metric: 'collaborationIndex',
-                    value: 68,
-                    previousValue: 65,
-                },
-                timestamp: Date.now(),
-            },
-        ]
-
-        let index = 0
-        const intervalId = setInterval(() => {
-            const message = {
-                ...mockMessages[index % mockMessages.length],
-                timestamp: Date.now(),
-            }
-            addMessage(message)
-            index++
-        }, interval)
-
-        return () => {
-            clearInterval(intervalId)
-            setConnectionState({ status: 'disconnected' })
-        }
-    }, [enabled, interval, addMessage, setConnectionState])
+  const { interval = 5000, enabled = process.env.NODE_ENV === 'development' } = options || {}
+  const { addMessage, setConnectionState } = useWSStore()
+
+  useEffect(() => {
+    if (!enabled) return
+
+    // Simulate connection
+    setConnectionState({ status: 'connected', lastConnectedAt: Date.now() })
+
+    const mockMessages: WSMessage[] = [
+      {
+        type: 'health_update',
+        payload: { overall: 72, trend: 'improving', delta: 2.5 },
+        timestamp: Date.now(),
+      },
+      {
+        type: 'event_new',
+        payload: {
+          id: 'evt-123',
+          title: 'Response latency spike detected',
+          department: 'Engineering',
+          severity: 'high',
+        },
+        timestamp: Date.now(),
+      },
+      {
+        type: 'insight_new',
+        payload: {
+          type: 'observation',
+          message: 'Handoff efficiency improved 8% this week',
+        },
+        timestamp: Date.now(),
+      },
+      {
+        type: 'metric_update',
+        payload: {
+          metric: 'collaborationIndex',
+          value: 68,
+          previousValue: 65,
+        },
+        timestamp: Date.now(),
+      },
+    ]
+
+    let index = 0
+    const intervalId = setInterval(() => {
+      const message = {
+        ...mockMessages[index % mockMessages.length],
+        timestamp: Date.now(),
+      }
+      addMessage(message)
+      index++
+    }, interval)
+
+    return () => {
+      clearInterval(intervalId)
+      setConnectionState({ status: 'disconnected' })
+    }
+  }, [enabled, interval, addMessage, setConnectionState])
 }
diff --git a/src/lib/reports/pdfGenerator.ts b/src/lib/reports/pdfGenerator.ts
index 486c818b..300cc695 100644
--- a/src/lib/reports/pdfGenerator.ts
+++ b/src/lib/reports/pdfGenerator.ts
@@ -1,6 +1,6 @@
 /**
  * Enhanced PDF Report Generator for FluxLens v1.0.2
- * 
+ *
  * Generates professional PDF reports with:
  * - Executive summary with key metrics
  * - Department health breakdown with visual indicators
@@ -16,383 +16,458 @@ import type { FluxDataResponse, DepartmentMetrics, FluxEvent } from '@/types'
 import type { OrgSettings } from '@/lib/db/types'
 
 interface PDFGeneratorOptions {
-    snapshot: FluxDataResponse
-    orgId: string
-    settings?: OrgSettings | null
-    includeCharts?: boolean
-    includeRecommendations?: boolean
+  snapshot: FluxDataResponse
+  orgId: string
+  settings?: OrgSettings | null
+  includeCharts?: boolean
+  includeRecommendations?: boolean
 }
 
 interface RoiMetrics {
-    signalCount: number
-    estimatedHoursSaved: number
-    dollarValue: number
-    preventedEscalations: number
+  signalCount: number
+  estimatedHoursSaved: number
+  dollarValue: number
+  preventedEscalations: number
 }
 
 // Color palette for the PDF
 const COLORS = {
-    primary: '#6C63FF',
-    secondary: '#8B5CF6',
-    success: '#10B981',
-    warning: '#F59E0B',
-    danger: '#EF4444',
-    text: {
-        primary: '#111827',
-        secondary: '#6B7280',
-        muted: '#9CA3AF',
-    },
-    bg: {
-        light: '#F9FAFB',
-        white: '#FFFFFF',
-    },
-    border: '#E5E7EB',
+  primary: '#6C63FF',
+  secondary: '#8B5CF6',
+  success: '#10B981',
+  warning: '#F59E0B',
+  danger: '#EF4444',
+  text: {
+    primary: '#111827',
+    secondary: '#6B7280',
+    muted: '#9CA3AF',
+  },
+  bg: {
+    light: '#F9FAFB',
+    white: '#FFFFFF',
+  },
+  border: '#E5E7EB',
 }
 
 function getRiskColor(risk: RiskLevel | string): string {
-    const riskValue = typeof risk === 'string' ? risk : risk as string
-    switch (riskValue) {
-        case 'critical':
-        case RiskLevel.CRITICAL:
-            return COLORS.danger
-        case 'high':
-        case RiskLevel.HIGH:
-            return COLORS.warning
-        case 'moderate':
-        case RiskLevel.MODERATE:
-            return '#F59E0B'
-        case 'low':
-        case RiskLevel.LOW:
-        default:
-            return COLORS.success
-    }
+  const riskValue = typeof risk === 'string' ? risk : (risk as string)
+  switch (riskValue) {
+    case 'critical':
+    case RiskLevel.CRITICAL:
+      return COLORS.danger
+    case 'high':
+    case RiskLevel.HIGH:
+      return COLORS.warning
+    case 'moderate':
+    case RiskLevel.MODERATE:
+      return '#F59E0B'
+    case 'low':
+    case RiskLevel.LOW:
+    default:
+      return COLORS.success
+  }
 }
 
 function computeRoi(snapshot: FluxDataResponse): RoiMetrics {
-    const signalCount = snapshot.events?.length ?? 0
-    const resolvedEvents = snapshot.events?.filter((e) => e.resolved).length ?? 0
-    const estimatedHoursSaved = Math.max(5, Math.round(signalCount * 1.5 + resolvedEvents * 2))
-    const dollarValue = estimatedHoursSaved * 150
-    const preventedEscalations = Math.floor(resolvedEvents * 0.3)
+  const signalCount = snapshot.events?.length ?? 0
+  const resolvedEvents = snapshot.events?.filter((e) => e.resolved).length ?? 0
+  const estimatedHoursSaved = Math.max(5, Math.round(signalCount * 1.5 + resolvedEvents * 2))
+  const dollarValue = estimatedHoursSaved * 150
+  const preventedEscalations = Math.floor(resolvedEvents * 0.3)
 
-    return { signalCount, estimatedHoursSaved, dollarValue, preventedEscalations }
+  return { signalCount, estimatedHoursSaved, dollarValue, preventedEscalations }
 }
 
 function getHealthStatus(score: number): { label: string; color: string } {
-    if (score >= 80) return { label: 'Excellent', color: COLORS.success }
-    if (score >= 60) return { label: 'Good', color: '#22C55E' }
-    if (score >= 40) return { label: 'Warning', color: COLORS.warning }
-    return { label: 'Critical', color: COLORS.danger }
+  if (score >= 80) return { label: 'Excellent', color: COLORS.success }
+  if (score >= 60) return { label: 'Good', color: '#22C55E' }
+  if (score >= 40) return { label: 'Warning', color: COLORS.warning }
+  return { label: 'Critical', color: COLORS.danger }
 }
 
 export async function generateEnhancedPdf(options: PDFGeneratorOptions): Promise<Buffer> {
-    const { snapshot, orgId, settings, includeRecommendations = true } = options
-
-    const roi = computeRoi(snapshot)
-    const health = snapshot.healthScore
-    const events = snapshot.events ?? []
-    const departments = snapshot.departments ?? []
-    const insights = snapshot.insights ?? []
-
-    // Calculate stats
-    const criticalEvents = events.filter((e) => e.severity === 'critical' && !e.resolved).length
-    const highEvents = events.filter((e) => e.severity === 'high' && !e.resolved).length
-    const resolvedThisWeek = events.filter((e) => {
-        const weekAgo = Date.now() - 7 * 24 * 60 * 60 * 1000
-        return e.resolved && e.createdAt > weekAgo
-    }).length
-
-    // Fetch logo if present
-    let logoBuffer: Buffer | null = null
-    if (settings?.logoUrl) {
-        try {
-            const res = await fetch(settings.logoUrl)
-            if (res.ok) {
-                const arrayBuffer = await res.arrayBuffer()
-                logoBuffer = Buffer.from(arrayBuffer)
-            }
-        } catch (e) {
-            console.warn('Failed to fetch logo for PDF', e)
-        }
+  const { snapshot, orgId, settings, includeRecommendations = true } = options
+
+  const roi = computeRoi(snapshot)
+  const health = snapshot.healthScore
+  const events = snapshot.events ?? []
+  const departments = snapshot.departments ?? []
+  const insights = snapshot.insights ?? []
+
+  // Calculate stats
+  const criticalEvents = events.filter((e) => e.severity === 'critical' && !e.resolved).length
+  const highEvents = events.filter((e) => e.severity === 'high' && !e.resolved).length
+  const resolvedThisWeek = events.filter((e) => {
+    const weekAgo = Date.now() - 7 * 24 * 60 * 60 * 1000
+    return e.resolved && e.createdAt > weekAgo
+  }).length
+
+  // Fetch logo if present
+  let logoBuffer: Buffer | null = null
+  if (settings?.logoUrl) {
+    try {
+      const res = await fetch(settings.logoUrl)
+      if (res.ok) {
+        const arrayBuffer = await res.arrayBuffer()
+        logoBuffer = Buffer.from(arrayBuffer)
+      }
+    } catch (e) {
+      console.warn('Failed to fetch logo for PDF', e)
     }
+  }
+
+  return new Promise<Buffer>((resolve) => {
+    const doc = new PDFDocument({
+      margin: 50,
+      size: 'A4',
+      info: {
+        Title: `FluxLens Health Report - ${settings?.orgName || orgId}`,
+        Author: 'FluxLens AI',
+        Subject: 'Organization Health Report',
+        CreationDate: new Date(),
+      },
+    })
 
-    return new Promise<Buffer>((resolve) => {
-        const doc = new PDFDocument({
-            margin: 50,
-            size: 'A4',
-            info: {
-                Title: `FluxLens Health Report - ${settings?.orgName || orgId}`,
-                Author: 'FluxLens AI',
-                Subject: 'Organization Health Report',
-                CreationDate: new Date(),
-            },
-        })
-
-        const chunks: Buffer[] = []
-        doc.on('data', (chunk: Buffer) => chunks.push(chunk))
-        doc.on('end', () => resolve(Buffer.concat(chunks)))
-
-        const brandColor = settings?.primaryColor || COLORS.primary
-        const pageWidth = doc.page.width - 100 // Account for margins
-
-        // =========================================================================
-        // HEADER SECTION
-        // =========================================================================
-
-        // Header background
-        doc.rect(0, 0, doc.page.width, 120).fill(brandColor)
-
-        // Logo or title
-        if (logoBuffer) {
-            try {
-                doc.image(logoBuffer, 50, 35, { height: 50, fit: [150, 50], align: 'left' })
-            } catch {
-                doc.fill('#FFFFFF').fontSize(28).font('Helvetica-Bold')
-                    .text(settings?.orgName ?? 'FluxLens', 50, 45)
-            }
-        } else {
-            doc.fill('#FFFFFF').fontSize(28).font('Helvetica-Bold')
-                .text(settings?.orgName ?? 'FluxLens', 50, 45)
-        }
-
-        // Report title and date
-        doc.fill('#FFFFFF').fontSize(12).font('Helvetica')
-            .text('Organizational Health Report', 50, 80)
-        doc.fill('rgba(255,255,255,0.8)').fontSize(10)
-            .text(`Generated: ${new Date().toLocaleDateString('en-US', {
-                weekday: 'long',
-                year: 'numeric',
-                month: 'long',
-                day: 'numeric',
-            })}`, 50, 98)
-
-        // =========================================================================
-        // EXECUTIVE SUMMARY
-        // =========================================================================
-
-        doc.y = 145
-        doc.fillColor(COLORS.text.primary).fontSize(18).font('Helvetica-Bold')
-            .text('Executive Summary', 50)
-
-        doc.moveDown(0.8)
-
-        // Health Score Card
-        const healthStatus = getHealthStatus(health?.overall ?? 0)
-        const cardY = doc.y
-
-        // Main health score box
-        doc.roundedRect(50, cardY, 180, 100, 8)
-            .fill(COLORS.bg.light)
-
-        doc.fillColor(COLORS.text.secondary).fontSize(10).font('Helvetica')
-            .text('OVERALL HEALTH', 60, cardY + 12)
-
-        doc.fillColor(healthStatus.color).fontSize(42).font('Helvetica-Bold')
-            .text(`${health?.overall ?? 0}`, 60, cardY + 30)
-
-        doc.fontSize(14).text(healthStatus.label, 130, cardY + 50)
-
-        // Trend indicator
-        const trendText = health?.trend === 'improving' ? '↑ Improving' :
-            health?.trend === 'declining' ? '↓ Declining' : '→ Stable'
-        const trendColor = health?.trend === 'improving' ? COLORS.success :
-            health?.trend === 'declining' ? COLORS.danger : COLORS.text.muted
-        doc.fillColor(trendColor).fontSize(10)
-            .text(trendText, 60, cardY + 78)
-
-        // Key metrics cards (side by side)
-        const metricsY = cardY
-        const metricCardWidth = 110
-        const metrics = [
-            { label: 'Active Signals', value: events.filter((e) => !e.resolved).length.toString() },
-            { label: 'Critical', value: criticalEvents.toString(), color: COLORS.danger },
-            { label: 'Resolved (7d)', value: resolvedThisWeek.toString(), color: COLORS.success },
-        ]
-
-        metrics.forEach((metric, idx) => {
-            const x = 250 + idx * (metricCardWidth + 10)
-            doc.roundedRect(x, metricsY, metricCardWidth, 100, 8).fill(COLORS.bg.light)
-
-            doc.fillColor(COLORS.text.secondary).fontSize(9).font('Helvetica')
-                .text(metric.label.toUpperCase(), x + 10, metricsY + 12)
-
-            doc.fillColor(metric.color || COLORS.text.primary).fontSize(28).font('Helvetica-Bold')
-                .text(metric.value, x + 10, metricsY + 35)
-        })
-
-        // =========================================================================
-        // ROI SECTION
-        // =========================================================================
-
-        doc.y = cardY + 125
-        doc.fillColor(COLORS.text.primary).fontSize(16).font('Helvetica-Bold')
-            .text('Value Delivered', 50)
-
-        doc.moveDown(0.5)
-
-        const roiItems = [
-            { label: 'Hours Saved', value: `${roi.estimatedHoursSaved}h`, icon: '⏱' },
-            { label: 'Cost Savings', value: `$${roi.dollarValue.toLocaleString()}`, icon: '💰' },
-            { label: 'Signals Analyzed', value: roi.signalCount.toString(), icon: '📊' },
-            { label: 'Escalations Prevented', value: roi.preventedEscalations.toString(), icon: '🛡️' },
-        ]
-
-        const roiY = doc.y
-        roiItems.forEach((item, idx) => {
-            const x = 50 + idx * (pageWidth / 4)
-            doc.fillColor(COLORS.text.secondary).fontSize(9).font('Helvetica')
-                .text(item.label, x, roiY)
-            doc.fillColor(COLORS.text.primary).fontSize(14).font('Helvetica-Bold')
-                .text(`${item.icon} ${item.value}`, x, roiY + 14)
-        })
-
-        // =========================================================================
-        // DEPARTMENT BREAKDOWN
-        // =========================================================================
-
-        doc.y = roiY + 55
-        doc.fillColor(COLORS.text.primary).fontSize(16).font('Helvetica-Bold')
-            .text('Department Health', 50)
-
-        doc.moveDown(0.5)
-
-        // Table header
-        const tableY = doc.y
-        doc.fillColor(COLORS.text.secondary).fontSize(9).font('Helvetica')
-        doc.text('Department', 50, tableY)
-        doc.text('Latency', 180, tableY)
-        doc.text('Handoff', 250, tableY)
-        doc.text('Meetings', 320, tableY)
-        doc.text('Collab', 390, tableY)
-        doc.text('Status', 460, tableY)
-
-        // Separator line
-        doc.moveTo(50, tableY + 14)
-            .lineTo(50 + pageWidth, tableY + 14)
-            .strokeColor(COLORS.border)
-            .lineWidth(1)
-            .stroke()
-
-        // Department rows
-        let rowY = tableY + 22
-        departments.forEach((dept) => {
-            if (rowY > 720) {
-                doc.addPage()
-                rowY = 50
-            }
-
-            // Determine department status based on metrics
-            const avgMetric = (dept.current.responseLatency + dept.current.handoffCompletionTime) / 2
-            const status = avgMetric > 5 ? 'critical' as const : avgMetric > 3 ? 'high' as const : avgMetric > 1.5 ? 'moderate' as const : 'low' as const
-
-            doc.fillColor(COLORS.text.primary).fontSize(10).font('Helvetica')
-            doc.text(dept.name, 50, rowY)
-            doc.text(`${dept.current.responseLatency.toFixed(1)}h`, 180, rowY)
-            doc.text(`${dept.current.handoffCompletionTime.toFixed(1)}h`, 250, rowY)
-            doc.text(dept.current.meetingDensity.toString(), 320, rowY)
-            doc.text(dept.current.collaborationIndex.toString(), 390, rowY)
-
-            // Status badge
-            const statusColor = getRiskColor(status)
-            doc.roundedRect(455, rowY - 3, 50, 16, 4).fill(statusColor)
-            doc.fillColor('#FFFFFF').fontSize(8).font('Helvetica-Bold')
-                .text(status.toUpperCase(), 460, rowY, { width: 40, align: 'center' })
-
-            rowY += 24
-        })
-
-        // =========================================================================
-        // RECENT SIGNALS / EVENTS
-        // =========================================================================
-
-        doc.y = rowY + 20
-        if (doc.y > 650) {
-            doc.addPage()
-            doc.y = 50
-        }
+    const chunks: Buffer[] = []
+    doc.on('data', (chunk: Buffer) => chunks.push(chunk))
+    doc.on('end', () => resolve(Buffer.concat(chunks)))
+
+    const brandColor = settings?.primaryColor || COLORS.primary
+    const pageWidth = doc.page.width - 100 // Account for margins
+
+    // =========================================================================
+    // HEADER SECTION
+    // =========================================================================
+
+    // Header background
+    doc.rect(0, 0, doc.page.width, 120).fill(brandColor)
+
+    // Logo or title
+    if (logoBuffer) {
+      try {
+        doc.image(logoBuffer, 50, 35, { height: 50, fit: [150, 50], align: 'left' })
+      } catch {
+        doc
+          .fill('#FFFFFF')
+          .fontSize(28)
+          .font('Helvetica-Bold')
+          .text(settings?.orgName ?? 'FluxLens', 50, 45)
+      }
+    } else {
+      doc
+        .fill('#FFFFFF')
+        .fontSize(28)
+        .font('Helvetica-Bold')
+        .text(settings?.orgName ?? 'FluxLens', 50, 45)
+    }
 
-        if (events.length > 0) {
-            doc.fillColor(COLORS.text.primary).fontSize(16).font('Helvetica-Bold')
-                .text('Recent Signals', 50)
+    // Report title and date
+    doc.fill('#FFFFFF').fontSize(12).font('Helvetica').text('Organizational Health Report', 50, 80)
+    doc
+      .fill('rgba(255,255,255,0.8)')
+      .fontSize(10)
+      .text(
+        `Generated: ${new Date().toLocaleDateString('en-US', {
+          weekday: 'long',
+          year: 'numeric',
+          month: 'long',
+          day: 'numeric',
+        })}`,
+        50,
+        98
+      )
+
+    // =========================================================================
+    // EXECUTIVE SUMMARY
+    // =========================================================================
+
+    doc.y = 145
+    doc
+      .fillColor(COLORS.text.primary)
+      .fontSize(18)
+      .font('Helvetica-Bold')
+      .text('Executive Summary', 50)
+
+    doc.moveDown(0.8)
+
+    // Health Score Card
+    const healthStatus = getHealthStatus(health?.overall ?? 0)
+    const cardY = doc.y
+
+    // Main health score box
+    doc.roundedRect(50, cardY, 180, 100, 8).fill(COLORS.bg.light)
+
+    doc
+      .fillColor(COLORS.text.secondary)
+      .fontSize(10)
+      .font('Helvetica')
+      .text('OVERALL HEALTH', 60, cardY + 12)
+
+    doc
+      .fillColor(healthStatus.color)
+      .fontSize(42)
+      .font('Helvetica-Bold')
+      .text(`${health?.overall ?? 0}`, 60, cardY + 30)
+
+    doc.fontSize(14).text(healthStatus.label, 130, cardY + 50)
+
+    // Trend indicator
+    const trendText =
+      health?.trend === 'improving'
+        ? '↑ Improving'
+        : health?.trend === 'declining'
+          ? '↓ Declining'
+          : '→ Stable'
+    const trendColor =
+      health?.trend === 'improving'
+        ? COLORS.success
+        : health?.trend === 'declining'
+          ? COLORS.danger
+          : COLORS.text.muted
+    doc
+      .fillColor(trendColor)
+      .fontSize(10)
+      .text(trendText, 60, cardY + 78)
+
+    // Key metrics cards (side by side)
+    const metricsY = cardY
+    const metricCardWidth = 110
+    const metrics = [
+      { label: 'Active Signals', value: events.filter((e) => !e.resolved).length.toString() },
+      { label: 'Critical', value: criticalEvents.toString(), color: COLORS.danger },
+      { label: 'Resolved (7d)', value: resolvedThisWeek.toString(), color: COLORS.success },
+    ]
+
+    metrics.forEach((metric, idx) => {
+      const x = 250 + idx * (metricCardWidth + 10)
+      doc.roundedRect(x, metricsY, metricCardWidth, 100, 8).fill(COLORS.bg.light)
+
+      doc
+        .fillColor(COLORS.text.secondary)
+        .fontSize(9)
+        .font('Helvetica')
+        .text(metric.label.toUpperCase(), x + 10, metricsY + 12)
+
+      doc
+        .fillColor(metric.color || COLORS.text.primary)
+        .fontSize(28)
+        .font('Helvetica-Bold')
+        .text(metric.value, x + 10, metricsY + 35)
+    })
 
-            doc.moveDown(0.5)
+    // =========================================================================
+    // ROI SECTION
+    // =========================================================================
+
+    doc.y = cardY + 125
+    doc
+      .fillColor(COLORS.text.primary)
+      .fontSize(16)
+      .font('Helvetica-Bold')
+      .text('Value Delivered', 50)
+
+    doc.moveDown(0.5)
+
+    const roiItems = [
+      { label: 'Hours Saved', value: `${roi.estimatedHoursSaved}h`, icon: '⏱' },
+      { label: 'Cost Savings', value: `$${roi.dollarValue.toLocaleString()}`, icon: '💰' },
+      { label: 'Signals Analyzed', value: roi.signalCount.toString(), icon: '📊' },
+      { label: 'Escalations Prevented', value: roi.preventedEscalations.toString(), icon: '🛡️' },
+    ]
+
+    const roiY = doc.y
+    roiItems.forEach((item, idx) => {
+      const x = 50 + idx * (pageWidth / 4)
+      doc.fillColor(COLORS.text.secondary).fontSize(9).font('Helvetica').text(item.label, x, roiY)
+      doc
+        .fillColor(COLORS.text.primary)
+        .fontSize(14)
+        .font('Helvetica-Bold')
+        .text(`${item.icon} ${item.value}`, x, roiY + 14)
+    })
 
-            // Show top 8 events
-            events.slice(0, 8).forEach((event) => {
-                if (doc.y > 720) {
-                    doc.addPage()
-                    doc.y = 50
-                }
+    // =========================================================================
+    // DEPARTMENT BREAKDOWN
+    // =========================================================================
+
+    doc.y = roiY + 55
+    doc
+      .fillColor(COLORS.text.primary)
+      .fontSize(16)
+      .font('Helvetica-Bold')
+      .text('Department Health', 50)
+
+    doc.moveDown(0.5)
+
+    // Table header
+    const tableY = doc.y
+    doc.fillColor(COLORS.text.secondary).fontSize(9).font('Helvetica')
+    doc.text('Department', 50, tableY)
+    doc.text('Latency', 180, tableY)
+    doc.text('Handoff', 250, tableY)
+    doc.text('Meetings', 320, tableY)
+    doc.text('Collab', 390, tableY)
+    doc.text('Status', 460, tableY)
+
+    // Separator line
+    doc
+      .moveTo(50, tableY + 14)
+      .lineTo(50 + pageWidth, tableY + 14)
+      .strokeColor(COLORS.border)
+      .lineWidth(1)
+      .stroke()
+
+    // Department rows
+    let rowY = tableY + 22
+    departments.forEach((dept) => {
+      if (rowY > 720) {
+        doc.addPage()
+        rowY = 50
+      }
+
+      // Determine department status based on metrics
+      const avgMetric = (dept.current.responseLatency + dept.current.handoffCompletionTime) / 2
+      const status =
+        avgMetric > 5
+          ? ('critical' as const)
+          : avgMetric > 3
+            ? ('high' as const)
+            : avgMetric > 1.5
+              ? ('moderate' as const)
+              : ('low' as const)
+
+      doc.fillColor(COLORS.text.primary).fontSize(10).font('Helvetica')
+      doc.text(dept.name, 50, rowY)
+      doc.text(`${dept.current.responseLatency.toFixed(1)}h`, 180, rowY)
+      doc.text(`${dept.current.handoffCompletionTime.toFixed(1)}h`, 250, rowY)
+      doc.text(dept.current.meetingDensity.toString(), 320, rowY)
+      doc.text(dept.current.collaborationIndex.toString(), 390, rowY)
+
+      // Status badge
+      const statusColor = getRiskColor(status)
+      doc.roundedRect(455, rowY - 3, 50, 16, 4).fill(statusColor)
+      doc
+        .fillColor('#FFFFFF')
+        .fontSize(8)
+        .font('Helvetica-Bold')
+        .text(status.toUpperCase(), 460, rowY, { width: 40, align: 'center' })
+
+      rowY += 24
+    })
 
-                const statusColor = getRiskColor(event.severity)
-                const date = new Date(event.createdAt ?? Date.now()).toLocaleDateString()
+    // =========================================================================
+    // RECENT SIGNALS / EVENTS
+    // =========================================================================
 
-                // Severity indicator
-                doc.circle(60, doc.y + 6, 5).fill(statusColor)
+    doc.y = rowY + 20
+    if (doc.y > 650) {
+      doc.addPage()
+      doc.y = 50
+    }
 
-                doc.fillColor(COLORS.text.primary).fontSize(10).font('Helvetica-Bold')
-                    .text(event.title || event.type, 75, doc.y)
+    if (events.length > 0) {
+      doc
+        .fillColor(COLORS.text.primary)
+        .fontSize(16)
+        .font('Helvetica-Bold')
+        .text('Recent Signals', 50)
 
-                doc.fillColor(COLORS.text.secondary).fontSize(9).font('Helvetica')
-                    .text(`${event.department || 'Unassigned'} • ${date} • ${event.severity.toUpperCase()}`, 75, doc.y + 14)
+      doc.moveDown(0.5)
 
-                doc.moveDown(1.5)
-            })
+      // Show top 8 events
+      events.slice(0, 8).forEach((event) => {
+        if (doc.y > 720) {
+          doc.addPage()
+          doc.y = 50
         }
 
-        // =========================================================================
-        // AI RECOMMENDATIONS (if enabled)
-        // =========================================================================
-
-        if (includeRecommendations && insights.length > 0) {
-            doc.y += 10
-            if (doc.y > 650) {
-                doc.addPage()
-                doc.y = 50
-            }
-
-            doc.fillColor(COLORS.text.primary).fontSize(16).font('Helvetica-Bold')
-                .text('AI Insights', 50)
+        const statusColor = getRiskColor(event.severity)
+        const date = new Date(event.createdAt ?? Date.now()).toLocaleDateString()
+
+        // Severity indicator
+        doc.circle(60, doc.y + 6, 5).fill(statusColor)
+
+        doc
+          .fillColor(COLORS.text.primary)
+          .fontSize(10)
+          .font('Helvetica-Bold')
+          .text(event.title || event.type, 75, doc.y)
+
+        doc
+          .fillColor(COLORS.text.secondary)
+          .fontSize(9)
+          .font('Helvetica')
+          .text(
+            `${event.department || 'Unassigned'} • ${date} • ${event.severity.toUpperCase()}`,
+            75,
+            doc.y + 14
+          )
+
+        doc.moveDown(1.5)
+      })
+    }
 
-            doc.moveDown(0.5)
+    // =========================================================================
+    // AI RECOMMENDATIONS (if enabled)
+    // =========================================================================
 
-            // Show top 5 insights
-            insights.filter((i) => !i.dismissed).slice(0, 5).forEach((insight) => {
-                if (doc.y > 720) {
-                    doc.addPage()
-                    doc.y = 50
-                }
+    if (includeRecommendations && insights.length > 0) {
+      doc.y += 10
+      if (doc.y > 650) {
+        doc.addPage()
+        doc.y = 50
+      }
 
-                const icon = insight.type === 'warning' ? '⚠️' :
-                    insight.type === 'opportunity' ? '💡' : '📝'
+      doc.fillColor(COLORS.text.primary).fontSize(16).font('Helvetica-Bold').text('AI Insights', 50)
 
-                doc.fillColor(COLORS.text.primary).fontSize(10).font('Helvetica')
-                    .text(`${icon} ${insight.message}`, 50, doc.y, { width: pageWidth })
+      doc.moveDown(0.5)
 
-                doc.moveDown(0.8)
-            })
-        }
+      // Show top 5 insights
+      insights
+        .filter((i) => !i.dismissed)
+        .slice(0, 5)
+        .forEach((insight) => {
+          if (doc.y > 720) {
+            doc.addPage()
+            doc.y = 50
+          }
 
-        // =========================================================================
-        // FOOTER
-        // =========================================================================
+          const icon =
+            insight.type === 'warning' ? '⚠️' : insight.type === 'opportunity' ? '💡' : '📝'
 
-        doc.page.margins.bottom = 30
-        const footerY = doc.page.height - 40
+          doc
+            .fillColor(COLORS.text.primary)
+            .fontSize(10)
+            .font('Helvetica')
+            .text(`${icon} ${insight.message}`, 50, doc.y, { width: pageWidth })
 
-        doc.fillColor(COLORS.text.muted).fontSize(8).font('Helvetica')
-            .text(
-                `Generated by FluxLens AI • ${new Date().toISOString()} • Organization: ${orgId}`,
-                50,
-                footerY,
-                { align: 'center', width: pageWidth }
-            )
+          doc.moveDown(0.8)
+        })
+    }
 
-        doc.end()
-    })
+    // =========================================================================
+    // FOOTER
+    // =========================================================================
+
+    doc.page.margins.bottom = 30
+    const footerY = doc.page.height - 40
+
+    doc
+      .fillColor(COLORS.text.muted)
+      .fontSize(8)
+      .font('Helvetica')
+      .text(
+        `Generated by FluxLens AI • ${new Date().toISOString()} • Organization: ${orgId}`,
+        50,
+        footerY,
+        { align: 'center', width: pageWidth }
+      )
+
+    doc.end()
+  })
 }
 
 // Simpler version for quick exports
 export async function generateQuickPdf(snapshot: FluxDataResponse, orgId: string): Promise<Buffer> {
-    return generateEnhancedPdf({ snapshot, orgId, includeRecommendations: false })
+  return generateEnhancedPdf({ snapshot, orgId, includeRecommendations: false })
 }