diff --git a/components/AIAnalysisPanel.tsx b/components/AIAnalysisPanel.tsx
index b4c3f46..3aea769 100644
--- a/components/AIAnalysisPanel.tsx
+++ b/components/AIAnalysisPanel.tsx
@@ -4,6 +4,12 @@ import TradeModal from './TradeModal'
 import ScreenshotGallery from './ScreenshotGallery'
 
 const layouts = (process.env.NEXT_PUBLIC_TRADINGVIEW_LAYOUTS || 'ai,Diy module').split(',').map(l => l.trim())
+
+// Layout display names mapping
+const layoutDisplayNames: { [key: string]: string } = {
+  'ai': 'ai',
+  'Diy module': 'Diy module'
+}
 const timeframes = [
   { label: '1m', value: '1' },
   { label: '5m', value: '5' },
@@ -57,7 +63,7 @@ interface AIAnalysisPanelProps {
 
 export default function AIAnalysisPanel({ onAnalysisComplete }: AIAnalysisPanelProps = {}) {
   const [symbol, setSymbol] = useState('BTCUSD')
-  const [selectedLayouts, setSelectedLayouts] = useState<string[]>(['ai', 'diy']) // Default to both AI and DIY
+  const [selectedLayouts, setSelectedLayouts] = useState<string[]>(['ai', 'Diy module']) // Default to both layouts
   const [selectedTimeframes, setSelectedTimeframes] = useState<string[]>(['60']) // Support multiple timeframes
   const [loading, setLoading] = useState(false)
   const [result, setResult] = useState<any>(null)
@@ -134,11 +140,25 @@ export default function AIAnalysisPanel({ onAnalysisComplete }: AIAnalysisPanelP
     }
   }, [eventSource])
 
+  // Normalize layout key to match backend expectations
+  const normalizeLayoutKey = (layout: string): string => {
+    // Keep the exact names as they appear in TradingView
+    if (layout === 'ai') return 'ai'
+    if (layout === 'Diy module') return 'Diy module' 
+    return layout
+  }
+
+  // Get display name for layout (keep exact TradingView names)
+  const getLayoutDisplayName = (layout: string): string => {
+    return layoutDisplayNames[layout] || layout
+  }
+
   const toggleLayout = (layout: string) => {
+    const normalizedLayout = normalizeLayoutKey(layout)
     setSelectedLayouts(prev => 
-      prev.includes(layout) 
-        ? prev.filter(l => l !== layout)
-        : [...prev, layout]
+      prev.includes(normalizedLayout) 
+        ? prev.filter(l => l !== normalizedLayout)
+        : [...prev, normalizedLayout]
     )
   }
 
@@ -680,39 +700,47 @@ export default function AIAnalysisPanel({ onAnalysisComplete }: AIAnalysisPanelP
         <div className="mb-6">
           <label className="block text-xs font-medium text-gray-400 mb-3">Analysis Layouts</label>
           <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
-            {layouts.map(layout => (
-              <label key={layout} className="group relative">
-                <input
-                  type="checkbox"
-                  checked={selectedLayouts.includes(layout)}
-                  onChange={() => toggleLayout(layout)}
-                  className="sr-only"
-                />
-                <div className={`flex items-center p-3 rounded-lg border cursor-pointer transition-all ${
-                  selectedLayouts.includes(layout)
-                    ? 'border-cyan-500 bg-cyan-500/10 text-cyan-300'
-                    : 'border-gray-700 bg-gray-800/30 text-gray-300 hover:border-gray-600 hover:bg-gray-800/50'
-                }`}>
-                  <div className={`w-4 h-4 rounded border-2 mr-3 flex items-center justify-center ${
-                    selectedLayouts.includes(layout)
-                      ? 'border-cyan-500 bg-cyan-500'
-                      : 'border-gray-600'
+            {layouts.map(layout => {
+              const normalizedLayout = normalizeLayoutKey(layout)
+              const displayName = getLayoutDisplayName(layout)
+              const isSelected = selectedLayouts.includes(normalizedLayout)
+              
+              return (
+                <label key={layout} className="group relative">
+                  <input
+                    type="checkbox"
+                    checked={isSelected}
+                    onChange={() => toggleLayout(layout)}
+                    className="sr-only"
+                  />
+                  <div className={`flex items-center p-3 rounded-lg border cursor-pointer transition-all ${
+                    isSelected
+                      ? 'border-cyan-500 bg-cyan-500/10 text-cyan-300'
+                      : 'border-gray-700 bg-gray-800/30 text-gray-300 hover:border-gray-600 hover:bg-gray-800/50'
                   }`}>
-                    {selectedLayouts.includes(layout) && (
-                      <svg className="w-2 h-2 text-white" fill="currentColor" viewBox="0 0 20 20">
-                        <path fillRule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clipRule="evenodd" />
-                      </svg>
-                    )}
+                    <div className={`w-4 h-4 rounded border-2 mr-3 flex items-center justify-center ${
+                      isSelected
+                        ? 'border-cyan-500 bg-cyan-500'
+                        : 'border-gray-600'
+                    }`}>
+                      {isSelected && (
+                        <svg className="w-2 h-2 text-white" fill="currentColor" viewBox="0 0 20 20">
+                          <path fillRule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clipRule="evenodd" />
+                        </svg>
+                      )}
+                    </div>
+                    <span className="text-sm font-medium">{displayName}</span>
                   </div>
-                  <span className="text-sm font-medium">{layout}</span>
-                </div>
-              </label>
-            ))}
+                </label>
+              )
+            })}
           </div>
           {selectedLayouts.length > 0 && (
             <div className="mt-3 p-3 bg-gray-800/30 rounded-lg">
               <div className="text-xs text-gray-400">
-                Selected layouts: <span className="text-cyan-400">{selectedLayouts.join(', ')}</span>
+                Selected layouts: <span className="text-cyan-400">
+                  {selectedLayouts.map(layout => getLayoutDisplayName(layout)).join(', ')}
+                </span>
               </div>
             </div>
           )}
@@ -811,7 +839,7 @@ export default function AIAnalysisPanel({ onAnalysisComplete }: AIAnalysisPanelP
               <div>
                 <h4 className="text-cyan-400 font-medium text-lg">AI Analysis in Progress</h4>
                 <p className="text-cyan-300 text-sm opacity-90">
-                  Analyzing {symbol} • {selectedLayouts.join(', ')} layouts
+                  Analyzing {symbol} • {selectedLayouts.map(layout => getLayoutDisplayName(layout)).join(', ')} layouts
                 </p>
               </div>
             </div>
diff --git a/lib/enhanced-screenshot.ts b/lib/enhanced-screenshot.ts
index fa26615..fa9ca4e 100644
--- a/lib/enhanced-screenshot.ts
+++ b/lib/enhanced-screenshot.ts
@@ -17,7 +17,8 @@ export interface ScreenshotConfig {
 const LAYOUT_URLS = {
   'ai': 'Z1TzpUrf',
   'diy': 'vWVvjLhP',
-  'Diy module': 'vWVvjLhP' // Alternative mapping for 'Diy module'
+  'Diy module': 'vWVvjLhP', // Exact TradingView name
+  'diy module': 'vWVvjLhP'  // Lowercase fallback
 }
 
 export class EnhancedScreenshotService {