diff --git a/app/layout.tsx b/app/layout.tsx
index ab3f150b..1c013a05 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -12,6 +12,8 @@ import { Toaster } from '@/components/ui/sonner'
 import { MapToggleProvider } from '@/components/map-toggle-context'
 import { ProfileToggleProvider } from '@/components/profile-toggle-context'
 import { MapLoadingProvider } from '@/components/map-loading-context';
+import { MapProvider } from '@/components/map/map-context';
+import { AnalysisToolProvider } from '@/components/analysis-tool-context';
 import ConditionalLottie from '@/components/conditional-lottie';
 
 const fontSans = FontSans({
@@ -64,12 +66,16 @@ export default function RootLayout({
               themes={['light', 'dark', 'earth']}
             >
               <MapLoadingProvider>
-                <Header />
-                <ConditionalLottie />
-                {children}
-                <Sidebar />
-                <Footer />
-                <Toaster />
+                <MapProvider>
+                  <AnalysisToolProvider>
+                    <Header />
+                    <ConditionalLottie />
+                    {children}
+                    <Sidebar />
+                    <Footer />
+                    <Toaster />
+                  </AnalysisToolProvider>
+                </MapProvider>
               </MapLoadingProvider>
             </ThemeProvider>
           </ProfileToggleProvider>
diff --git a/components/analysis-tool.tsx b/components/analysis-tool-context.tsx
similarity index 67%
rename from components/analysis-tool.tsx
rename to components/analysis-tool-context.tsx
index db53fa71..4a63c46e 100644
--- a/components/analysis-tool.tsx
+++ b/components/analysis-tool-context.tsx
@@ -1,16 +1,25 @@
 'use client'
 
-import React, { useState } from 'react'
+'use client'
+
+import React, { createContext, useContext, useState, ReactNode } from 'react'
 import { useActions, useUIState } from 'ai/rsc'
 import { AI } from '@/app/actions'
-import { Button } from '@/components/ui/button'
-import { Search } from 'lucide-react'
 import { useMap } from './map/map-context'
 import { nanoid } from 'nanoid'
 import { UserMessage } from './user-message'
 import { toast } from 'react-toastify'
 
-export function AnalysisTool() {
+type AnalysisToolContextType = {
+  isAnalyzing: boolean
+  handleResolutionSearch: () => void
+}
+
+const AnalysisToolContext = createContext<AnalysisToolContextType | undefined>(
+  undefined
+)
+
+export const AnalysisToolProvider = ({ children }: { children: ReactNode }) => {
   const { map } = useMap()
   const { submit } = useActions()
   const [, setMessages] = useUIState<typeof AI>()
@@ -57,21 +66,18 @@ export function AnalysisTool() {
   }
 
   return (
-    <div className="absolute top-4 right-4 z-20">
-      <Button
-        variant="outline"
-        size="icon"
-        onClick={handleResolutionSearch}
-        disabled={isAnalyzing || !map}
-        title="Analyze current map view"
-        className="bg-background/80 backdrop-blur-sm hover:bg-background"
-      >
-        {isAnalyzing ? (
-          <div className="h-5 w-5 animate-spin rounded-full border-b-2 border-current"></div>
-        ) : (
-          <Search className="h-5 w-5" />
-        )}
-      </Button>
-    </div>
+    <AnalysisToolContext.Provider
+      value={{ isAnalyzing, handleResolutionSearch }}
+    >
+      {children}
+    </AnalysisToolContext.Provider>
   )
+}
+
+export const useAnalysisTool = (): AnalysisToolContextType => {
+  const context = useContext(AnalysisToolContext)
+  if (!context) {
+    throw new Error('useAnalysisTool must be used within an AnalysisToolProvider')
+  }
+  return context
 }
\ No newline at end of file
diff --git a/components/chat.tsx b/components/chat.tsx
index 44de7be0..4fadc617 100644
--- a/components/chat.tsx
+++ b/components/chat.tsx
@@ -13,11 +13,6 @@ import SettingsView from "@/components/settings/settings-view";
 import { MapDataProvider, useMapData } from './map/map-data-context'; // Add this and useMapData
 import { MapProvider } from './map/map-context'
 import { updateDrawingContext } from '@/lib/actions/chat'; // Import the server action
-import dynamic from 'next/dynamic'
-
-const AnalysisTool = dynamic(() => import('./analysis-tool').then(mod => mod.AnalysisTool), {
-  ssr: false,
-})
 
 type ChatProps = {
   id?: string // This is the chatId
@@ -86,42 +81,17 @@ export function Chat({ id }: ChatProps) {
   if (isMobile) {
     return (
       <MapDataProvider> {/* Add Provider */}
-        <MapProvider>
-          <div className="mobile-layout-container">
-            <div className="mobile-map-section">
-            {activeView ? <SettingsView /> : <Mapbox />}
-          </div>
-          <div className="mobile-icons-bar">
-            <MobileIconsBar onAttachmentClick={handleAttachment} />
-          </div>
-          <div className="mobile-chat-input-area">
-            <ChatPanel ref={chatPanelRef} messages={messages} input={input} setInput={setInput} />
-          </div>
-          <div className="mobile-chat-messages-area">
-            {showEmptyScreen ? (
-              <EmptyScreen
-                submitMessage={message => {
-                  setInput(message)
-                }}
-              />
-            ) : (
-              <ChatMessages messages={messages} />
-            )}
-            </div>
-          </div>
-        </MapProvider>
-      </MapDataProvider>
-    );
-  }
-  
-  // Desktop layout
-  return (
-    <MapDataProvider> {/* Add Provider */}
-      <MapProvider>
-        <div className="flex justify-start items-start">
-          {/* This is the new div for scrolling */}
-        <div className="w-1/2 flex flex-col space-y-3 md:space-y-4 px-8 sm:px-12 pt-12 md:pt-14 pb-4 h-[calc(100vh-0.5in)] overflow-y-auto">
-          <ChatPanel messages={messages} input={input} setInput={setInput} />
+        <div className="mobile-layout-container">
+          <div className="mobile-map-section">
+          {activeView ? <SettingsView /> : <Mapbox />}
+        </div>
+        <div className="mobile-icons-bar">
+          <MobileIconsBar onAttachmentClick={handleAttachment} />
+        </div>
+        <div className="mobile-chat-input-area">
+          <ChatPanel ref={chatPanelRef} messages={messages} input={input} setInput={setInput} />
+        </div>
+        <div className="mobile-chat-messages-area">
           {showEmptyScreen ? (
             <EmptyScreen
               submitMessage={message => {
@@ -131,16 +101,36 @@ export function Chat({ id }: ChatProps) {
           ) : (
             <ChatMessages messages={messages} />
           )}
-        </div>
-          <div
-            className="w-1/2 p-4 fixed h-[calc(100vh-0.5in)] top-0 right-0 mt-[0.5in]"
-            style={{ zIndex: 10 }} // Added z-index
-          >
-            {activeView ? <SettingsView /> : <Mapbox />}
-            <AnalysisTool />
           </div>
         </div>
-      </MapProvider>
+      </MapDataProvider>
+    );
+  }
+
+  // Desktop layout
+  return (
+    <MapDataProvider> {/* Add Provider */}
+      <div className="flex justify-start items-start">
+        {/* This is the new div for scrolling */}
+      <div className="w-1/2 flex flex-col space-y-3 md:space-y-4 px-8 sm:px-12 pt-12 md:pt-14 pb-4 h-[calc(100vh-0.5in)] overflow-y-auto">
+        <ChatPanel messages={messages} input={input} setInput={setInput} />
+        {showEmptyScreen ? (
+          <EmptyScreen
+            submitMessage={message => {
+              setInput(message)
+            }}
+          />
+        ) : (
+          <ChatMessages messages={messages} />
+        )}
+      </div>
+        <div
+          className="w-1/2 p-4 fixed h-[calc(100vh-0.5in)] top-0 right-0 mt-[0.5in]"
+          style={{ zIndex: 10 }} // Added z-index
+        >
+          {activeView ? <SettingsView /> : <Mapbox />}
+        </div>
+      </div>
     </MapDataProvider>
   );
 }
diff --git a/components/header.tsx b/components/header.tsx
index 0a370612..9b53d65f 100644
--- a/components/header.tsx
+++ b/components/header.tsx
@@ -1,3 +1,5 @@
+'use client'
+
 import React from 'react'
 import Image from 'next/image'
 import { ModeToggle } from './mode-toggle'
@@ -13,8 +15,13 @@ import {
 } from 'lucide-react'
 import { MapToggle } from './map-toggle'
 import { ProfileToggle } from './profile-toggle'
+import { useAnalysisTool } from './analysis-tool-context'
+import { useMap } from './map/map-context'
 
 export const Header = () => {
+  const { isAnalyzing, handleResolutionSearch } = useAnalysisTool()
+  const { map } = useMap()
+
   return (
     <header className="fixed w-full p-1 md:p-2 flex justify-between items-center z-10 backdrop-blur md:backdrop-blur-none bg-background/80 md:bg-transparent">
       <div>
@@ -39,8 +46,18 @@ export const Header = () => {
           <CalendarDays className="h-[1.2rem] w-[1.2rem]" />
         </Button>
         
-        <Button variant="ghost" size="icon">
-          <Search className="h-[1.2rem] w-[1.2rem]" />
+        <Button
+          variant="ghost"
+          size="icon"
+          onClick={handleResolutionSearch}
+          disabled={isAnalyzing || !map}
+          title="Analyze current map view"
+        >
+          {isAnalyzing ? (
+            <div className="h-[1.2rem] w-[1.2rem] animate-spin rounded-full border-b-2 border-current"></div>
+          ) : (
+            <Search className="h-[1.2rem] w-[1.2rem]" />
+          )}
         </Button>
         
         <Button variant="ghost" size="icon">
diff --git a/components/mobile-icons-bar.tsx b/components/mobile-icons-bar.tsx
index 217154d6..efccdeb7 100644
--- a/components/mobile-icons-bar.tsx
+++ b/components/mobile-icons-bar.tsx
@@ -17,6 +17,8 @@ import {
 import { History } from '@/components/history'
 import { MapToggle } from './map-toggle'
 import { ModeToggle } from './mode-toggle'
+import { useAnalysisTool } from './analysis-tool-context'
+import { useMap } from './map/map-context'
 
 interface MobileIconsBarProps {
   onAttachmentClick: () => void;
@@ -25,6 +27,8 @@ interface MobileIconsBarProps {
 export const MobileIconsBar: React.FC<MobileIconsBarProps> = ({ onAttachmentClick }) => {
   const [, setMessages] = useUIState<typeof AI>()
   const { clearChat } = useActions()
+  const { isAnalyzing, handleResolutionSearch } = useAnalysisTool()
+  const { map } = useMap()
 
   const handleNewChat = async () => {
     setMessages([])
@@ -43,8 +47,18 @@ export const MobileIconsBar: React.FC<MobileIconsBarProps> = ({ onAttachmentClic
       <Button variant="ghost" size="icon">
         <CalendarDays className="h-[1.2rem] w-[1.2rem] transition-all rotate-0 scale-100" />
       </Button>
-      <Button variant="ghost" size="icon">
-        <Search className="h-[1.2rem] w-[1.2rem] transition-all rotate-0 scale-100" />
+      <Button
+        variant="ghost"
+        size="icon"
+        onClick={handleResolutionSearch}
+        disabled={isAnalyzing || !map}
+        title="Analyze current map view"
+      >
+        {isAnalyzing ? (
+          <div className="h-[1.2rem] w-[1.2rem] animate-spin rounded-full border-b-2 border-current"></div>
+        ) : (
+          <Search className="h-[1.2rem] w-[1.2rem] transition-all rotate-0 scale-100" />
+        )}
       </Button>
       <Button variant="ghost" size="icon">
         <TentTree className="h-[1.2rem] w-[1.2rem] transition-all rotate-0 scale-100" />
diff --git a/dev_server.log b/dev_server.log
index bac9469f..59e3b892 100644
--- a/dev_server.log
+++ b/dev_server.log
@@ -1,7 +1 @@
 $ next dev --turbo
-   ▲ Next.js 15.3.3 (Turbopack)
-   - Local:        http://localhost:3000
-   - Network:      http://192.168.0.2:3000
-   - Environments: .env.local, .env
-
- ✓ Starting...
diff --git a/jules-scratch/verification/error_screenshot.png b/jules-scratch/verification/error_screenshot.png
deleted file mode 100644
index 2ded8b21..00000000
Binary files a/jules-scratch/verification/error_screenshot.png and /dev/null differ
diff --git a/jules-scratch/verification/verify_e2e_analysis.py b/jules-scratch/verification/verify_e2e_analysis.py
deleted file mode 100644
index 60f035e0..00000000
--- a/jules-scratch/verification/verify_e2e_analysis.py
+++ /dev/null
@@ -1,66 +0,0 @@
-import re
-from playwright.sync_api import sync_playwright, expect, Page
-
-def verify_resolution_search_e2e(page: Page):
-    """
-    Performs a full end-to-end test of the Resolution Search feature.
-    - Waits for the main loading overlay to disappear.
-    - Forcefully enables the analysis button.
-    - Clicks the button to trigger the backend action.
-    - Waits for the analysis results to be displayed.
-    - Takes a screenshot to confirm success.
-    """
-    # Listen for all console events and print them to the terminal for debugging.
-    page.on("console", lambda msg: print(f"BROWSER CONSOLE: {msg.type} - {msg.text}"))
-
-    # 1. Navigate to the app.
-    print("Navigating to http://localhost:3000...")
-    page.goto("http://localhost:3000", timeout=60000)
-
-    # 2. Wait for the main loading overlay to disappear.
-    # This is a critical step to ensure the UI is interactive.
-    print("Waiting for loading overlay to disappear...")
-    loading_overlay = page.locator('div[class*="z-[9999]"]')
-    expect(loading_overlay).to_be_hidden(timeout=60000)
-    print("Loading overlay is hidden.")
-
-    # 3. Wait for the button to be present, then forcefully enable it.
-    print("Waiting for the analysis button to be present...")
-    search_button_locator = page.get_by_title("Analyze current map view")
-    expect(search_button_locator).to_be_visible(timeout=10000)
-    print("Button is visible. Forcefully enabling it...")
-    search_button_locator.evaluate("button => button.disabled = false")
-    expect(search_button_locator).to_be_enabled()
-    print("Button is now enabled.")
-
-    # 4. Click the button to trigger the analysis.
-    print("Clicking the analysis button...")
-    search_button_locator.click()
-
-    # 5. Wait for the analysis results to appear in the chat.
-    print("Waiting for analysis results to appear...")
-    analysis_title = page.get_by_role("heading", name="Map Analysis")
-    expect(analysis_title).to_be_visible(timeout=120000) # Long timeout for AI
-    print("Analysis results are visible.")
-
-    # 6. Take a screenshot for visual confirmation.
-    print("Taking screenshot...")
-    page.screenshot(path="jules-scratch/verification/verification.png")
-    print("Screenshot saved to jules-scratch/verification/verification.png")
-
-def main():
-    with sync_playwright() as p:
-        browser = p.chromium.launch(headless=True)
-        page = browser.new_page()
-        try:
-            verify_resolution_search_e2e(page)
-            print("\n✅ Verification successful!")
-        except Exception as e:
-            print(f"\n❌ An error occurred during verification: {e}")
-            page.screenshot(path="jules-scratch/verification/error_screenshot.png")
-            print("Error screenshot saved to jules-scratch/verification/error_screenshot.png")
-        finally:
-            browser.close()
-
-if __name__ == "__main__":
-    main()
\ No newline at end of file