diff --git a/MoneyMap/Pages/ViewReceipt.cshtml b/MoneyMap/Pages/ViewReceipt.cshtml
index 203665d..fe65e61 100644
--- a/MoneyMap/Pages/ViewReceipt.cshtml
+++ b/MoneyMap/Pages/ViewReceipt.cshtml
@@ -165,27 +165,23 @@
                         <div class="mb-2">
                             <label for="model" class="form-label small">AI Model</label>
                             <select name="model" id="model" class="form-select form-select-sm">
-                                @if (Model.AvailableModels.Any())
+                                @foreach (var m in Model.AvailableModels)
                                 {
-                                    <optgroup label="Local (llama.cpp)">
-                                        @foreach (var m in Model.AvailableModels)
-                                        {
-                                            var modelValue = $"llamacpp:{m.Id}";
-                                            <option value="@modelValue" selected="@(Model.SelectedModel == modelValue)">
-                                                @(m.IsLoaded ? "[Loaded] " : "")@m.Id
-                                            </option>
-                                        }
-                                    </optgroup>
+                                    var modelValue = $"llamacpp:{m.Id}";
+                                    var isSelected = Model.SelectedModel == modelValue;
+                                    <option value="@modelValue" selected="@isSelected">
+                                        @(m.IsLoaded ? "● " : "○ ")@m.Id
+                                    </option>
                                 }
-                                <optgroup label="OpenAI">
-                                    <option value="gpt-4o-mini" selected="@(Model.SelectedModel == "gpt-4o-mini")">GPT-4o Mini (Fast & Cheap)</option>
-                                    <option value="gpt-4o" selected="@(Model.SelectedModel == "gpt-4o")">GPT-4o (Smarter)</option>
-                                </optgroup>
-                                <optgroup label="Anthropic">
-                                    <option value="claude-3-5-haiku-20241022" selected="@(Model.SelectedModel == "claude-3-5-haiku-20241022")">Claude 3.5 Haiku (Fast)</option>
-                                    <option value="claude-3-5-sonnet-20241022" selected="@(Model.SelectedModel == "claude-3-5-sonnet-20241022")">Claude 3.5 Sonnet (Best)</option>
-                                </optgroup>
+                                <option value="gpt-4o-mini" selected="@(Model.SelectedModel == "gpt-4o-mini")">GPT-4o Mini</option>
+                                <option value="gpt-4o" selected="@(Model.SelectedModel == "gpt-4o")">GPT-4o</option>
+                                <option value="claude-3-5-haiku-20241022" selected="@(Model.SelectedModel == "claude-3-5-haiku-20241022")">Claude 3.5 Haiku</option>
+                                <option value="claude-3-5-sonnet-20241022" selected="@(Model.SelectedModel == "claude-3-5-sonnet-20241022")">Claude 3.5 Sonnet</option>
                             </select>
+                            <div class="form-text small">
+                                <span style="color: #28a745;">●</span> Loaded
+                                <span class="ms-2" style="color: #6c757d;">○</span> Not loaded
+                            </div>
                         </div>
                         <button type="submit" class="btn btn-primary btn-sm w-100">
                             Parse Receipt
diff --git a/MoneyMap/Services/AIVisionClient.cs b/MoneyMap/Services/AIVisionClient.cs
index 30bf059..44d279a 100644
--- a/MoneyMap/Services/AIVisionClient.cs
+++ b/MoneyMap/Services/AIVisionClient.cs
@@ -240,7 +240,7 @@ namespace MoneyMap.Services
         /// </summary>
         public async Task<List<LlamaCppModel>> GetAvailableModelsAsync()
         {
-            var baseUrl = _configuration["LlamaCpp:BaseUrl"] ?? "http://athena.lan:11434";
+            var baseUrl = _configuration["AI:ModelsEndpoint"] ?? "http://athena.lan:11434";
 
             try
             {
@@ -278,7 +278,7 @@ namespace MoneyMap.Services
         /// </summary>
         public async Task<VisionApiResult> SendTextPromptAsync(string prompt, string? model = null)
         {
-            var baseUrl = _configuration["LlamaCpp:BaseUrl"] ?? "http://athena.lan:11434";
+            var baseUrl = _configuration["AI:ModelsEndpoint"] ?? "http://athena.lan:11434";
             var llamaModel = model ?? "GLM-4.6V-UD-Q4_K_XL-00001-of-00002";
             if (llamaModel.StartsWith("llamacpp:"))
                 llamaModel = llamaModel[9..];
@@ -340,7 +340,7 @@ namespace MoneyMap.Services
 
         public async Task<VisionApiResult> AnalyzeImageAsync(string base64Image, string mediaType, string prompt, string model)
         {
-            var baseUrl = _configuration["LlamaCpp:BaseUrl"] ?? "http://athena.lan:8080";
+            var baseUrl = _configuration["AI:ModelsEndpoint"] ?? "http://athena.lan:11434";
 
             // Strip "llamacpp:" prefix if present
             var llamaModel = model.StartsWith("llamacpp:") ? model[9..] : model;
@@ -441,7 +441,7 @@ namespace MoneyMap.Services
 
         public async Task<VisionApiResult> AnalyzeImageAsync(string base64Image, string mediaType, string prompt, string model)
         {
-            var baseUrl = _configuration["Ollama:BaseUrl"] ?? "http://athena.lan:11434";
+            var baseUrl = _configuration["AI:ModelsEndpoint"] ?? "http://athena.lan:11434";
 
             // Strip "ollama:" prefix if present
             var ollamaModel = model.StartsWith("ollama:") ? model[7..] : model;