diff --git a/.gitignore b/.gitignore
index 60fa6678..700c6ccc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,6 @@ release
 data
 binaries
 .env
+
+# Sentry Config File
+.env.sentry-build-plugin
diff --git a/electron/main/llm/ipcHandlers.ts b/electron/main/llm/ipcHandlers.ts
index 17c8f342..f44d2844 100644
--- a/electron/main/llm/ipcHandlers.ts
+++ b/electron/main/llm/ipcHandlers.ts
@@ -12,6 +12,7 @@ export const ollamaService = new OllamaService()
 export const registerLLMSessionHandlers = (store: Store<StoreSchema>) => {
   ipcMain.handle('set-default-llm', (event, modelName: string) => {
     store.set(StoreKeys.DefaultLLM, modelName)
+    event.sender.send('llm-configs-changed')
   })
 
   ipcMain.handle('get-default-llm-name', () => store.get(StoreKeys.DefaultLLM))
@@ -22,14 +23,17 @@ export const registerLLMSessionHandlers = (store: Store<StoreSchema>) => {
 
   ipcMain.handle('add-or-update-llm-config', async (event, llmConfig: LLMConfig) => {
     await addOrUpdateLLMInStore(store, llmConfig)
+    event.sender.send('llm-configs-changed')
   })
 
   ipcMain.handle('add-or-update-llm-api-config', async (event, llmAPIConfig: LLMAPIConfig) => {
     await addOrUpdateLLMAPIInStore(store, llmAPIConfig)
+    event.sender.send('llm-configs-changed')
   })
 
   ipcMain.handle('remove-llm', async (event, modelNameToDelete: string) => {
     await removeLLM(store, ollamaService, modelNameToDelete)
+    event.sender.send('llm-configs-changed')
   })
 
   ipcMain.handle('pull-ollama-model', async (event, modelName: string) => {
@@ -37,9 +41,11 @@ export const registerLLMSessionHandlers = (store: Store<StoreSchema>) => {
       event.sender.send('ollamaDownloadProgress', modelName, progress)
     }
     await ollamaService.pullModel(modelName, handleProgress)
+    event.sender.send('llm-configs-changed')
   })
 
   ipcMain.handle('delete-llm', async (event, modelName: string) => {
     await ollamaService.deleteModel(modelName)
+    event.sender.send('llm-configs-changed')
   })
 }
diff --git a/package-lock.json b/package-lock.json
index ab0b27b3..c59185c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,6 +41,7 @@
         "@radix-ui/react-tabs": "^1.1.1",
         "@radix-ui/react-tooltip": "^1.1.3",
         "@sentry/electron": "^5.3.0",
+        "@sentry/vite-plugin": "^2.22.6",
         "@tailwindcss/typography": "^0.5.10",
         "@tiptap/core": "^2.5.0",
         "@tiptap/extension-bubble-menu": "^2.4.0",
@@ -397,7 +398,6 @@
     },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.1",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.0",
@@ -457,7 +457,6 @@
     },
     "node_modules/@babel/compat-data": {
       "version": "7.23.5",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -465,7 +464,6 @@
     },
     "node_modules/@babel/core": {
       "version": "7.23.9",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
@@ -494,12 +492,10 @@
     },
     "node_modules/@babel/core/node_modules/convert-source-map": {
       "version": "2.0.0",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@babel/core/node_modules/semver": {
       "version": "6.3.1",
-      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -507,7 +503,6 @@
     },
     "node_modules/@babel/generator": {
       "version": "7.23.6",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.23.6",
@@ -521,7 +516,6 @@
     },
     "node_modules/@babel/helper-compilation-targets": {
       "version": "7.23.6",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.23.5",
@@ -536,7 +530,6 @@
     },
     "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
       "version": "6.3.1",
-      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -544,7 +537,6 @@
     },
     "node_modules/@babel/helper-environment-visitor": {
       "version": "7.22.20",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -552,7 +544,6 @@
     },
     "node_modules/@babel/helper-function-name": {
       "version": "7.23.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.22.15",
@@ -564,7 +555,6 @@
     },
     "node_modules/@babel/helper-hoist-variables": {
       "version": "7.22.5",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.22.5"
@@ -585,7 +575,6 @@
     },
     "node_modules/@babel/helper-module-transforms": {
       "version": "7.23.3",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.20",
@@ -611,7 +600,6 @@
     },
     "node_modules/@babel/helper-simple-access": {
       "version": "7.22.5",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.22.5"
@@ -622,7 +610,6 @@
     },
     "node_modules/@babel/helper-split-export-declaration": {
       "version": "7.22.6",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.22.5"
@@ -648,7 +635,6 @@
     },
     "node_modules/@babel/helper-validator-option": {
       "version": "7.23.5",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -656,7 +642,6 @@
     },
     "node_modules/@babel/helpers": {
       "version": "7.23.9",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.23.9",
@@ -681,7 +666,6 @@
     },
     "node_modules/@babel/parser": {
       "version": "7.23.9",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -893,7 +877,6 @@
     },
     "node_modules/@babel/template": {
       "version": "7.23.9",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.23.5",
@@ -906,7 +889,6 @@
     },
     "node_modules/@babel/traverse": {
       "version": "7.23.9",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.23.5",
@@ -2350,7 +2332,6 @@
     },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.3",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.0.1",
@@ -2363,7 +2344,6 @@
     },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.2",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
@@ -2371,7 +2351,6 @@
     },
     "node_modules/@jridgewell/set-array": {
       "version": "1.1.2",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
@@ -2379,12 +2358,10 @@
     },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.4.15",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.22",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
@@ -5269,6 +5246,14 @@
         "node": ">=14.18"
       }
     },
+    "node_modules/@sentry/babel-plugin-component-annotate": {
+      "version": "2.22.6",
+      "resolved": "https://registry.npmjs.org/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-2.22.6.tgz",
+      "integrity": "sha512-V2g1Y1I5eSe7dtUVMBvAJr8BaLRr4CLrgNgtPaZyMT4Rnps82SrZ5zqmEkLXPumlXhLUWR6qzoMNN2u+RXVXfQ==",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/@sentry/browser": {
       "version": "8.20.0",
       "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.20.0.tgz",
@@ -5286,6 +5271,199 @@
         "node": ">=14.18"
       }
     },
+    "node_modules/@sentry/bundler-plugin-core": {
+      "version": "2.22.6",
+      "resolved": "https://registry.npmjs.org/@sentry/bundler-plugin-core/-/bundler-plugin-core-2.22.6.tgz",
+      "integrity": "sha512-1esQdgSUCww9XAntO4pr7uAM5cfGhLsgTK9MEwAKNfvpMYJi9NUTYa3A7AZmdA8V6107Lo4OD7peIPrDRbaDCg==",
+      "dependencies": {
+        "@babel/core": "^7.18.5",
+        "@sentry/babel-plugin-component-annotate": "2.22.6",
+        "@sentry/cli": "^2.36.1",
+        "dotenv": "^16.3.1",
+        "find-up": "^5.0.0",
+        "glob": "^9.3.2",
+        "magic-string": "0.30.8",
+        "unplugin": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@sentry/bundler-plugin-core/node_modules/glob": {
+      "version": "9.3.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz",
+      "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "minimatch": "^8.0.2",
+        "minipass": "^4.2.4",
+        "path-scurry": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@sentry/bundler-plugin-core/node_modules/minimatch": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz",
+      "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@sentry/bundler-plugin-core/node_modules/minipass": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz",
+      "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@sentry/cli": {
+      "version": "2.38.1",
+      "resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-2.38.1.tgz",
+      "integrity": "sha512-XFO04nP7cn0tboMQ4ALR81QRF/6xoWAFzNld7Io6jHbaFzihqewjxAqy7pSvVPaieepUjqe7m/Ippt00kKOACg==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "https-proxy-agent": "^5.0.0",
+        "node-fetch": "^2.6.7",
+        "progress": "^2.0.3",
+        "proxy-from-env": "^1.1.0",
+        "which": "^2.0.2"
+      },
+      "bin": {
+        "sentry-cli": "bin/sentry-cli"
+      },
+      "engines": {
+        "node": ">= 10"
+      },
+      "optionalDependencies": {
+        "@sentry/cli-darwin": "2.38.1",
+        "@sentry/cli-linux-arm": "2.38.1",
+        "@sentry/cli-linux-arm64": "2.38.1",
+        "@sentry/cli-linux-i686": "2.38.1",
+        "@sentry/cli-linux-x64": "2.38.1",
+        "@sentry/cli-win32-i686": "2.38.1",
+        "@sentry/cli-win32-x64": "2.38.1"
+      }
+    },
+    "node_modules/@sentry/cli-darwin": {
+      "version": "2.38.1",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-darwin/-/cli-darwin-2.38.1.tgz",
+      "integrity": "sha512-IHuxm072aSTAvwuHtLg065cF00Pxm2wprnrRr2lkyWp8nLOoO7DmumWZ4pjHvhB8yZXsAbM/PSxLRBoDIRDPzQ==",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@sentry/cli-linux-arm": {
+      "version": "2.38.1",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-2.38.1.tgz",
+      "integrity": "sha512-xyf4f56O4/eeirol8t1tTQw0cwF34b3v69zn6wHtKfx2lW5IEBGO+agVNdOdosnCx6j3UadgdRXUJlSyM9kx/w==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "linux",
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@sentry/cli-linux-arm64": {
+      "version": "2.38.1",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.38.1.tgz",
+      "integrity": "sha512-3bj5DS4wDusL0YHwG5qeI+O19kz4N4KDDmnWqIew56MmSSAEM5B0qKk5Hivu1vRU5vPKFwVn8BVjLnKXu9idjg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux",
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@sentry/cli-linux-i686": {
+      "version": "2.38.1",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-2.38.1.tgz",
+      "integrity": "sha512-VygJO2oTc6GfiqqmPYNpO2bW1hzszuNyn37SSmeRuuhq1/kRwD+ZQj4OmXYEASjSLg+8mDPoWOurPjHEPKNtNw==",
+      "cpu": [
+        "x86",
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "linux",
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@sentry/cli-linux-x64": {
+      "version": "2.38.1",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-2.38.1.tgz",
+      "integrity": "sha512-9SaPJK5yAGR7qGsDubTT9O7VpNQG9KIolCOov4xJU7scbmjGaFyYBm9c7ZIqbq6B+56YchPbtD0RewZC6CiF2w==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux",
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@sentry/cli-win32-i686": {
+      "version": "2.38.1",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-2.38.1.tgz",
+      "integrity": "sha512-BVUM5y+ZDBK/LqyVvt0C7oolmg8aq7PI/u04/Pp6FLRExySqwyQim0vNyL2FRjIeX1yhbk7x4Z79UjEKqJBltA==",
+      "cpu": [
+        "x86",
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@sentry/cli-win32-x64": {
+      "version": "2.38.1",
+      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-2.38.1.tgz",
+      "integrity": "sha512-+HgsdM3LFSzUNlDpicPRdTKfr5u+nJ2C5p4aDYPb2G+qoYW+66FI4NxgWSyzJsj3nVQ8lW5/6AoMP6U5z/e/0A==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@sentry/core": {
       "version": "8.20.0",
       "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.20.0.tgz",
@@ -5399,6 +5577,18 @@
         "node": ">=14.18"
       }
     },
+    "node_modules/@sentry/vite-plugin": {
+      "version": "2.22.6",
+      "resolved": "https://registry.npmjs.org/@sentry/vite-plugin/-/vite-plugin-2.22.6.tgz",
+      "integrity": "sha512-zIieP1VLWQb3wUjFJlwOAoaaJygJhXeUoGd0e/Ha2RLb2eW2S+4gjf6y6NqyY71tZ74LYVZKg/4prB6FAZSMXQ==",
+      "dependencies": {
+        "@sentry/bundler-plugin-core": "2.22.6",
+        "unplugin": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
       "dev": true,
@@ -6604,7 +6794,6 @@
     },
     "node_modules/agent-base": {
       "version": "6.0.2",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "debug": "4"
@@ -7514,7 +7703,6 @@
     },
     "node_modules/balanced-match": {
       "version": "1.0.2",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/bare-events": {
@@ -7599,7 +7787,6 @@
     },
     "node_modules/brace-expansion": {
       "version": "2.0.1",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -7617,7 +7804,6 @@
     },
     "node_modules/browserslist": {
       "version": "4.23.0",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -7900,7 +8086,6 @@
       "version": "1.0.30001651",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz",
       "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -9742,7 +9927,6 @@
     },
     "node_modules/electron-to-chromium": {
       "version": "1.4.673",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/electron-updater": {
@@ -10074,7 +10258,6 @@
     },
     "node_modules/escalade": {
       "version": "3.1.2",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -11505,7 +11688,6 @@
     },
     "node_modules/find-up": {
       "version": "5.0.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "locate-path": "^6.0.0",
@@ -11730,7 +11912,6 @@
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/fsevents": {
@@ -11777,7 +11958,6 @@
     },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -11947,7 +12127,6 @@
     },
     "node_modules/globals": {
       "version": "11.12.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -12333,7 +12512,6 @@
     },
     "node_modules/https-proxy-agent": {
       "version": "5.0.1",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "agent-base": "6",
@@ -13020,7 +13198,6 @@
     },
     "node_modules/isexe": {
       "version": "2.0.0",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/istanbul-lib-coverage": {
@@ -14721,7 +14898,6 @@
     },
     "node_modules/jsesc": {
       "version": "2.5.2",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
@@ -14772,7 +14948,6 @@
     },
     "node_modules/json5": {
       "version": "2.2.3",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
@@ -15284,7 +15459,6 @@
     },
     "node_modules/locate-path": {
       "version": "6.0.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "p-locate": "^5.0.0"
@@ -15370,7 +15544,6 @@
     },
     "node_modules/lru-cache": {
       "version": "5.1.1",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "yallist": "^3.0.2"
@@ -15384,6 +15557,17 @@
         "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc"
       }
     },
+    "node_modules/magic-string": {
+      "version": "0.30.8",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
+      "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.15"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/make-dir": {
       "version": "4.0.0",
       "dev": true,
@@ -16124,7 +16308,6 @@
     },
     "node_modules/minipass": {
       "version": "5.0.0",
-      "dev": true,
       "license": "ISC",
       "engines": {
         "node": ">=8"
@@ -16316,7 +16499,6 @@
     },
     "node_modules/node-releases": {
       "version": "2.0.14",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/normalize-package-data": {
@@ -19291,7 +19473,6 @@
     },
     "node_modules/p-limit": {
       "version": "3.1.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "yocto-queue": "^0.1.0"
@@ -19305,7 +19486,6 @@
     },
     "node_modules/p-locate": {
       "version": "5.0.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "p-limit": "^3.0.2"
@@ -19434,7 +19614,6 @@
     },
     "node_modules/path-exists": {
       "version": "4.0.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -19462,7 +19641,6 @@
     },
     "node_modules/path-scurry": {
       "version": "1.10.1",
-      "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
         "lru-cache": "^9.1.1 || ^10.0.0",
@@ -19477,7 +19655,6 @@
     },
     "node_modules/path-scurry/node_modules/lru-cache": {
       "version": "10.2.0",
-      "dev": true,
       "license": "ISC",
       "engines": {
         "node": "14 || >=16.14"
@@ -19525,7 +19702,6 @@
     },
     "node_modules/picocolors": {
       "version": "1.0.0",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/picomatch": {
@@ -20135,7 +20311,6 @@
     },
     "node_modules/progress": {
       "version": "2.0.3",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
@@ -22900,9 +23075,19 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/unplugin": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.0.1.tgz",
+      "integrity": "sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==",
+      "dependencies": {
+        "acorn": "^8.8.1",
+        "chokidar": "^3.5.3",
+        "webpack-sources": "^3.2.3",
+        "webpack-virtual-modules": "^0.5.0"
+      }
+    },
     "node_modules/update-browserslist-db": {
       "version": "1.0.13",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -23286,6 +23471,19 @@
       "version": "3.0.1",
       "license": "BSD-2-Clause"
     },
+    "node_modules/webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/webpack-virtual-modules": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
+      "integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw=="
+    },
     "node_modules/whatwg-fetch": {
       "version": "3.6.20",
       "license": "MIT"
@@ -23300,7 +23498,6 @@
     },
     "node_modules/which": {
       "version": "2.0.2",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
@@ -23531,7 +23728,6 @@
     },
     "node_modules/yallist": {
       "version": "3.1.1",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/yaml": {
@@ -23577,7 +23773,6 @@
     },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10"
diff --git a/package.json b/package.json
index 39dadda2..d419b02a 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
     "@radix-ui/react-tabs": "^1.1.1",
     "@radix-ui/react-tooltip": "^1.1.3",
     "@sentry/electron": "^5.3.0",
+    "@sentry/vite-plugin": "^2.22.6",
     "@tailwindcss/typography": "^0.5.10",
     "@tiptap/core": "^2.5.0",
     "@tiptap/extension-bubble-menu": "^2.4.0",
diff --git a/src/App.tsx b/src/App.tsx
index d258eacc..0cdb007a 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -79,7 +79,15 @@ const App: React.FC<AppProps> = () => {
   return (
     <div className="max-h-screen bg-neutral-800 font-sans">
       <Portal>
-        <ToastContainer className="mt-4" />
+        <ToastContainer
+          theme="dark"
+          position="bottom-right"
+          autoClose={3000}
+          hideProgressBar={false}
+          closeOnClick
+          pauseOnHover
+          toastClassName="text-xs" // Added max height and overflow
+        />{' '}
       </Portal>
       {!userHasConfiguredSettingsForIndexing && (
         <InitialSetupSinglePage readyForIndexing={handleAllInitialSettingsAreReady} />
diff --git a/src/components/Chat/ChatConfigComponents/exampleAgents.ts b/src/components/Chat/ChatConfigComponents/exampleAgents.ts
index 22fe3759..6b29235a 100644
--- a/src/components/Chat/ChatConfigComponents/exampleAgents.ts
+++ b/src/components/Chat/ChatConfigComponents/exampleAgents.ts
@@ -14,7 +14,7 @@ Here are some guidelines you must follow:
   },
   {
     role: 'user',
-    content: `{QUERY}`,
+    content: `The user's query is: {QUERY}`,
   },
 ]
 
@@ -65,7 +65,7 @@ const exampleAgents: AgentConfig[] = [
     files: [],
     name: 'Default',
     dbSearchFilters: {
-      limit: 30,
+      limit: 20,
       minDate: undefined,
       maxDate: undefined,
       passFullNoteIntoContext: true,
diff --git a/src/components/Chat/ChatInput.tsx b/src/components/Chat/ChatInput.tsx
index 22aabb44..00808157 100644
--- a/src/components/Chat/ChatInput.tsx
+++ b/src/components/Chat/ChatInput.tsx
@@ -1,13 +1,21 @@
 import React from 'react'
 
 import { PiPaperPlaneRight } from 'react-icons/pi'
-import { LoadingState } from '../../lib/llm/types'
+import { AgentConfig, LoadingState } from '../../lib/llm/types'
+import { Button } from '../ui/button'
+import LLMSelectOrButton from '../Settings/LLMSettings/LLMSelectOrButton'
+import { Switch } from '@/components/ui/switch'
+import { Label } from '@/components/ui/label'
 
 interface ChatInputProps {
   userTextFieldInput: string
   setUserTextFieldInput: (value: string) => void
   handleSubmitNewMessage: () => void
   loadingState: LoadingState
+  selectedLLM: string | undefined
+  setSelectedLLM: (value: string | undefined) => void
+  agentConfig: AgentConfig | undefined
+  setAgentConfig: React.Dispatch<React.SetStateAction<AgentConfig | undefined>>
 }
 
 const ChatInput: React.FC<ChatInputProps> = ({
@@ -15,48 +23,95 @@ const ChatInput: React.FC<ChatInputProps> = ({
   setUserTextFieldInput,
   handleSubmitNewMessage,
   loadingState,
-}) => (
-  <div className="flex h-titlebar w-full items-center justify-center  p-10">
-    <div className="  relative bottom-5 flex w-full max-w-3xl">
-      <div className="w-full rounded-lg border-2 border-solid border-neutral-700 p-3 focus-within:ring-1 focus-within:ring-[#8c8c8c]">
-        <div className="flex h-full pr-8">
-          <textarea
-            onKeyDown={(e) => {
-              if (userTextFieldInput && !e.shiftKey && e.key === 'Enter') {
-                e.preventDefault()
-                handleSubmitNewMessage()
-              }
-            }}
-            onChange={(e) => setUserTextFieldInput(e.target.value)}
-            value={userTextFieldInput}
-            className="mr-2 max-h-[50px] w-full resize-none overflow-y-auto border-0 bg-gray-300 focus:outline-none"
-            name="Outlined"
-            placeholder="Follow up..."
-            rows={1}
-            // eslint-disable-next-line jsx-a11y/no-autofocus
-            autoFocus
-            style={{
-              backgroundColor: 'rgba(255, 255, 255, 0)',
-              color: 'rgb(212 212 212)',
-              border: 'none',
-            }}
-            onInput={(e) => {
-              const target = e.target as HTMLTextAreaElement // Prevent TS inferring type error
-              target.style.height = 'auto'
-              target.style.height = `${Math.min(target.scrollHeight, 160)}px`
-            }}
-          />
-          <div className="absolute right-3 top-1/2 -translate-y-1/2">
-            <PiPaperPlaneRight
-              color={userTextFieldInput && loadingState !== 'idle' ? 'white' : 'gray'}
-              onClick={userTextFieldInput ? handleSubmitNewMessage : undefined}
-              className={userTextFieldInput ? 'cursor-pointer' : ''}
-            />
+  selectedLLM,
+  setSelectedLLM,
+  agentConfig,
+  setAgentConfig,
+}) => {
+  // const [useStream, setUseStream] = React.useState(true)
+
+  const handleDbSearchToggle = (checked: boolean) => {
+    setAgentConfig((prevConfig) => {
+      if (!prevConfig) throw new Error('Agent config must be initialized before setting db search filters')
+      return {
+        ...prevConfig,
+        dbSearchFilters: checked
+          ? {
+              limit: 22,
+              minDate: undefined,
+              maxDate: undefined,
+              passFullNoteIntoContext: true,
+            }
+          : undefined,
+      }
+    })
+  }
+
+  return (
+    <div className="flex w-full">
+      <div className="z-50 flex w-full flex-col overflow-hidden rounded border-2 border-solid border-border bg-background focus-within:ring-1 focus-within:ring-ring">
+        {/* <Select value={selectedLLM}>
+          <SelectTrigger className="h-7 w-32 border-0 text-[10px] text-gray-300 focus:ring-0 focus:ring-offset-0">
+            <SelectValue placeholder="Tools" />
+          </SelectTrigger>
+          <SelectContent className="rounded-md border border-dark-gray-c-eight bg-[#1c1c1c]">
+            {allAvailableToolDefinitions.map((tool) => (
+              <SelectItem
+                key={tool.displayName}
+                value={tool.name}
+                className="cursor-pointer text-[10px] text-gray-300 hover:bg-[#252525] focus:bg-[#252525] focus:text-gray-200"
+              >
+                {tool.displayName}
+              </SelectItem>
+            ))}
+          </SelectContent>
+        </Select> */}
+        <textarea
+          value={userTextFieldInput}
+          onKeyDown={(e) => {
+            if (!e.shiftKey && e.key === 'Enter') {
+              e.preventDefault()
+              handleSubmitNewMessage()
+            }
+          }}
+          className="h-[100px] w-full resize-none border-0 bg-transparent p-4 text-foreground caret-current focus:outline-none"
+          wrap="soft"
+          placeholder="What can Reor help you with today?"
+          onChange={(e) => setUserTextFieldInput(e.target.value)}
+          // eslint-disable-next-line jsx-a11y/no-autofocus
+          autoFocus
+        />
+        <div className="mx-auto h-px w-[96%] bg-background/20" />
+        <div className="flex h-10 flex-col items-center justify-between gap-2  py-2 md:flex-row md:gap-4">
+          <div className="flex flex-col items-center justify-between rounded-md border-0 py-2 md:flex-row">
+            <LLMSelectOrButton selectedLLM={selectedLLM} setSelectedLLM={setSelectedLLM} />
+          </div>
+
+          <div className="flex items-center">
+            <div className="mr-[-8px] flex flex-col">
+              <Switch
+                id="search-notes"
+                checked={!!agentConfig?.dbSearchFilters}
+                onCheckedChange={handleDbSearchToggle}
+                className="scale-[0.6]"
+              />
+              <Label htmlFor="stream-mode" className="mt-0 text-[8px] text-muted-foreground">
+                Search notes
+              </Label>
+            </div>
+
+            <Button
+              className="flex items-center justify-between bg-transparent text-[10px] text-primary hover:bg-transparent hover:text-accent-foreground"
+              onClick={handleSubmitNewMessage}
+              disabled={loadingState !== 'idle'}
+            >
+              <PiPaperPlaneRight className="size-4" />
+            </Button>
           </div>
         </div>
       </div>
     </div>
-  </div>
-)
+  )
+}
 
 export default ChatInput
diff --git a/src/components/Chat/ChatMessages.tsx b/src/components/Chat/ChatMessages.tsx
index c308a7aa..ab427ca5 100644
--- a/src/components/Chat/ChatMessages.tsx
+++ b/src/components/Chat/ChatMessages.tsx
@@ -7,6 +7,8 @@ import AssistantMessage from './MessageComponents/AssistantMessage'
 import SystemMessage from './MessageComponents/SystemMessage'
 import ChatSources from './MessageComponents/ChatSources'
 import LoadingDots from '@/lib/animations'
+import useLLMConfigs from '@/lib/hooks/use-llm-configs'
+import useAgentConfig from '@/lib/hooks/use-agent-configs'
 
 interface MessageProps {
   message: ReorChatMessage
@@ -41,7 +43,7 @@ interface ChatMessagesProps {
   currentChat: Chat | undefined
   setCurrentChat: React.Dispatch<React.SetStateAction<Chat | undefined>>
   loadingState: LoadingState
-  handleNewChatMessage: (userTextFieldInput?: string, agentConfig?: AgentConfig) => void
+  handleNewChatMessage: (llmName: string, userTextFieldInput?: string, agentConfig?: AgentConfig) => void
 }
 
 const ChatMessages: React.FC<ChatMessagesProps> = ({
@@ -50,11 +52,18 @@ const ChatMessages: React.FC<ChatMessagesProps> = ({
   handleNewChatMessage,
   loadingState,
 }) => {
+  const { agentConfig, setAgentConfig } = useAgentConfig()
   const [userTextFieldInput, setUserTextFieldInput] = useState<string | undefined>()
+  const { defaultLLM, setDefaultLLM } = useLLMConfigs()
+  const [selectedLLM, setSelectedLLM] = useState<string>()
   const [shouldAutoScroll, setShouldAutoScroll] = useState(true)
   const chatContainerRef = useRef<HTMLDivElement>(null)
   const lastMessageRef = useRef<HTMLDivElement>(null)
 
+  useEffect(() => {
+    setSelectedLLM(defaultLLM)
+  }, [defaultLLM])
+
   const scrollToBottom = useCallback(() => {
     if (chatContainerRef.current) {
       const { scrollHeight, clientHeight } = chatContainerRef.current
@@ -78,13 +87,11 @@ const ChatMessages: React.FC<ChatMessagesProps> = ({
 
   const handleSubmitNewMessage = async () => {
     if (userTextFieldInput) {
-      // this for v1 could just use the default agent config...
-      const agentConfigs = await window.electronStore.getAgentConfigs()
-      if (agentConfigs && agentConfigs.length > 0) {
-        handleNewChatMessage(userTextFieldInput, agentConfigs[0])
-      } else {
-        handleNewChatMessage(userTextFieldInput)
+      if (!selectedLLM) {
+        throw new Error('Select an LLM.')
       }
+      setDefaultLLM(selectedLLM)
+      handleNewChatMessage(selectedLLM, userTextFieldInput, agentConfig)
       setUserTextFieldInput('')
       setShouldAutoScroll(true)
     }
@@ -134,6 +141,10 @@ const ChatMessages: React.FC<ChatMessagesProps> = ({
           setUserTextFieldInput={setUserTextFieldInput}
           handleSubmitNewMessage={handleSubmitNewMessage}
           loadingState={loadingState}
+          selectedLLM={selectedLLM}
+          setSelectedLLM={setSelectedLLM}
+          agentConfig={agentConfig}
+          setAgentConfig={setAgentConfig}
         />
       </div>
     </div>
diff --git a/src/components/Chat/MessageComponents/AssistantMessage.tsx b/src/components/Chat/MessageComponents/AssistantMessage.tsx
index 6d2368d5..4748d8cf 100644
--- a/src/components/Chat/MessageComponents/AssistantMessage.tsx
+++ b/src/components/Chat/MessageComponents/AssistantMessage.tsx
@@ -4,11 +4,7 @@ import { toast } from 'react-toastify'
 import { ToolCallPart } from 'ai'
 import { FaRegCopy } from 'react-icons/fa'
 import { Chat, ReorChatMessage } from '../../../lib/llm/types'
-import {
-  extractMessagePartsFromAssistantMessage,
-  findToolResultMatchingToolCall,
-  getClassNameBasedOnMessageRole,
-} from '../../../lib/llm/chat'
+import { extractMessagePartsFromAssistantMessage, findToolResultMatchingToolCall } from '../../../lib/llm/chat'
 import { ToolCallComponent } from './ToolCalls'
 import { useContentContext } from '@/contexts/ContentContext'
 import { useChatContext } from '@/contexts/ChatContext'
@@ -74,15 +70,15 @@ const AssistantMessage: React.FC<AssistantMessageProps> = ({ message, setCurrent
           <div>
             {/* eslint-disable-next-line react/no-array-index-key */}
             <MarkdownRenderer key={index} content={text} />
-            <div className="mt-2 flex">
+            <div className="mt-0 flex">
               <div
-                className="cursor-pointer items-center justify-center rounded p-1 hover:bg-neutral-700"
+                className="cursor-pointer items-center justify-center rounded px-1 hover:bg-neutral-700"
                 onClick={copyToClipboard}
               >
                 <FaRegCopy color="gray" size={16} className="text-gray-200" title="Copy" />
               </div>
               <div
-                className="cursor-pointer items-center justify-center rounded p-1 hover:bg-neutral-700"
+                className="cursor-pointer items-center justify-center rounded px-1 hover:bg-neutral-700"
                 onClick={createNewNoteFromMessage}
               >
                 <HiOutlinePencilAlt color="gray" size={18} className="text-gray-200" title="New Note" />
@@ -103,7 +99,7 @@ const AssistantMessage: React.FC<AssistantMessageProps> = ({ message, setCurrent
   }
 
   return (
-    <div className={`w-full ${getClassNameBasedOnMessageRole(message)} mb-4 flex`}>
+    <div className="mb-7 flex w-full text-[0.94rem] leading-[1.2rem] text-[rgb(210,210,210)] ">
       <div className="w-full flex-col gap-1">
         <div className="flex grow flex-col ">{renderContent()}</div>
       </div>
diff --git a/src/components/Chat/MessageComponents/SystemMessage.tsx b/src/components/Chat/MessageComponents/SystemMessage.tsx
index c18d6322..3974c483 100644
--- a/src/components/Chat/MessageComponents/SystemMessage.tsx
+++ b/src/components/Chat/MessageComponents/SystemMessage.tsx
@@ -2,14 +2,14 @@ import React from 'react'
 import ReactMarkdown from 'react-markdown'
 import rehypeRaw from 'rehype-raw'
 import { ReorChatMessage } from '../../../lib/llm/types'
-import { getClassNameBasedOnMessageRole, getDisplayMessage } from '../../../lib/llm/chat'
+import { getDisplayMessage } from '../../../lib/llm/chat'
 
 interface SystemMessageProps {
   message: ReorChatMessage
 }
 
 const SystemMessage: React.FC<SystemMessageProps> = ({ message }) => (
-  <div className={`w-full ${getClassNameBasedOnMessageRole(message)} mb-4 flex`}>
+  <div className="mb-4  flex w-full">
     <div className="w-full flex-col gap-1">
       <div className="flex grow flex-col px-5 py-2.5">
         <ReactMarkdown rehypePlugins={[rehypeRaw]} className="max-w-[95%] break-words">
diff --git a/src/components/Chat/MessageComponents/UserMessage.tsx b/src/components/Chat/MessageComponents/UserMessage.tsx
index 1b99be35..e289e429 100644
--- a/src/components/Chat/MessageComponents/UserMessage.tsx
+++ b/src/components/Chat/MessageComponents/UserMessage.tsx
@@ -1,25 +1,22 @@
 import React from 'react'
-import { FaRegUserCircle } from 'react-icons/fa'
 import ReactMarkdown from 'react-markdown'
 import rehypeRaw from 'rehype-raw'
 import { ReorChatMessage } from '../../../lib/llm/types'
-import { getClassNameBasedOnMessageRole, getDisplayMessage } from '../../../lib/llm/chat'
+import { getDisplayMessage } from '../../../lib/llm/chat'
 
 interface UserMessageProps {
   message: ReorChatMessage
 }
 
 const UserMessage: React.FC<UserMessageProps> = ({ message }) => (
-  <div className={`w-full ${getClassNameBasedOnMessageRole(message)} mb-4 flex`}>
-    <div className="relative items-start pl-4 pt-3">
-      <FaRegUserCircle size={22} />
-    </div>
-    <div className="w-full flex-col gap-1">
-      <div className="flex grow flex-col px-5 py-2.5">
-        <ReactMarkdown rehypePlugins={[rehypeRaw]} className="max-w-[95%] break-words">
-          {getDisplayMessage(message)}
-        </ReactMarkdown>
-      </div>
+  <div className="mb-0 w-full flex-col gap-1">
+    <div className="flex grow flex-col">
+      <ReactMarkdown
+        rehypePlugins={[rehypeRaw]}
+        className="max-w-[95%] break-words text-2xl font-bold text-neutral-400"
+      >
+        {getDisplayMessage(message)}
+      </ReactMarkdown>
     </div>
   </div>
 )
diff --git a/src/components/Chat/StartChat.tsx b/src/components/Chat/StartChat.tsx
index a56e5a18..d6ffa9ac 100644
--- a/src/components/Chat/StartChat.tsx
+++ b/src/components/Chat/StartChat.tsx
@@ -1,270 +1,245 @@
-import React, { useCallback, useEffect, useState } from 'react'
-import { PiPaperPlaneRight } from 'react-icons/pi'
-import { FiSettings } from 'react-icons/fi'
-import { LLMConfig } from 'electron/main/electron-store/storeConfig'
-import { AgentConfig, ToolDefinition, DatabaseSearchFilters } from '../../lib/llm/types'
-import { Button } from '@/components/ui/button'
-import DbSearchFilters from './ChatConfigComponents/DBSearchFilters'
-import PromptEditor from './ChatConfigComponents/PromptEditor'
-import {
-  Drawer,
-  DrawerClose,
-  DrawerContent,
-  DrawerDescription,
-  DrawerFooter,
-  DrawerHeader,
-  DrawerTitle,
-  DrawerTrigger,
-} from '@/components/ui/drawer'
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import { Label } from '../ui/label'
-import { Switch } from '../ui/switch'
-import exampleAgents from './ChatConfigComponents/exampleAgents'
-import { allAvailableToolDefinitions } from '@/lib/llm/tools/tool-definitions'
-import ToolSelector from './ChatConfigComponents/ToolSelector'
-import SuggestionCard from '../ui/suggestion-card'
-import LLMSelectOrButton from '../Settings/LLMSettings/LLMSelectOrButton'
+// import React, { useCallback, useState } from 'react'
+// import { PiPaperPlaneRight } from 'react-icons/pi'
+// import { FiSettings } from 'react-icons/fi'
+// import { AgentConfig, ToolDefinition, DatabaseSearchFilters } from '../../lib/llm/types'
+// import { Button } from '@/components/ui/button'
+// import DbSearchFilters from './ChatConfigComponents/DBSearchFilters'
+// import PromptEditor from './ChatConfigComponents/PromptEditor'
+// import {
+//   Drawer,
+//   DrawerClose,
+//   DrawerContent,
+//   DrawerDescription,
+//   DrawerFooter,
+//   DrawerHeader,
+//   DrawerTitle,
+//   DrawerTrigger,
+// } from '@/components/ui/drawer'
+// import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
+// import { Label } from '../ui/label'
+// import { Switch } from '../ui/switch'
+// import { allAvailableToolDefinitions } from '@/lib/llm/tools/tool-definitions'
+// import ToolSelector from './ChatConfigComponents/ToolSelector'
+// import SuggestionCard from '../ui/suggestion-card'
+// import LLMSelectOrButton from '../Settings/LLMSettings/LLMSelectOrButton'
+// import useLLMConfigs from '@/lib/hooks/use-llm-configs'
+// import useAgentConfig from '@/lib/hooks/use-agent-configs'
 
-interface StartChatProps {
-  defaultModelName: string
-  handleNewChatMessage: (userTextFieldInput?: string, chatFilters?: AgentConfig) => void
-}
+// interface StartChatProps {
+//   handleNewChatMessage: (llmName: string, userTextFieldInput?: string, chatFilters?: AgentConfig) => void
+// }
 
-const StartChat: React.FC<StartChatProps> = ({ defaultModelName, handleNewChatMessage }) => {
-  const [llmConfigs, setLLMConfigs] = useState<LLMConfig[]>([])
-  const [selectedLLM, setSelectedLLM] = useState<string>(defaultModelName)
-  const [userTextFieldInput, setUserTextFieldInput] = useState<string>('')
-  const [agentConfig, setAgentConfig] = useState<AgentConfig>()
-  const [promptSuggestions] = useState([
-    'Generate a list of all the thoughts I have written on the topic of AGI',
-    'Summarize my recent notes on machine learning',
-    'Based on what I wrote last week, which tasks should I focus on this week?',
-  ])
+// const StartChat: React.FC<StartChatProps> = ({ handleNewChatMessage }) => {
+//   const { defaultLLM, setDefaultLLM } = useLLMConfigs()
+//   const [selectedLLM, setSelectedLLM] = useState<string>(defaultLLM)
+//   const [userTextFieldInput, setUserTextFieldInput] = useState<string>('')
+//   const { agentConfig, setAgentConfig } = useAgentConfig()
+//   const [promptSuggestions] = useState([
+//     'Generate a list of all the thoughts I have written on the topic of AGI',
+//     'Summarize my recent notes on machine learning',
+//     'Based on what I wrote last week, which tasks should I focus on this week?',
+//   ])
 
-  useEffect(() => {
-    const fetchAgentConfigs = async () => {
-      const agentConfigs = await window.electronStore.getAgentConfigs()
-      if (agentConfigs && agentConfigs.length > 0) {
-        setAgentConfig(agentConfigs[0])
-      } else {
-        setAgentConfig(exampleAgents[0])
-      }
-    }
-    fetchAgentConfigs()
-  }, [])
+//   const sendMessageHandler = async () => {
+//     await setDefaultLLM(selectedLLM)
+//     if (!agentConfig) {
+//       throw new Error('No agent config found')
+//     }
+//     handleNewChatMessage(selectedLLM, userTextFieldInput, { ...agentConfig })
+//   }
 
-  useEffect(() => {
-    const fetchLLMModels = async () => {
-      const LLMConfigs = await window.llm.getLLMConfigs()
-      setLLMConfigs(LLMConfigs)
-      const defaultLLM = await window.llm.getDefaultLLMName()
-      setSelectedLLM(defaultLLM)
-    }
-    fetchLLMModels()
-  }, [])
+//   const handleToolsChange = (tools: ToolDefinition[]) => {
+//     setAgentConfig((prevConfig) => {
+//       if (!prevConfig) throw new Error('Agent config must be initialized before setting tools')
+//       return { ...prevConfig, toolDefinitions: tools }
+//     })
+//   }
 
-  const sendMessageHandler = async () => {
-    await window.llm.setDefaultLLM(selectedLLM)
-    if (!agentConfig) {
-      throw new Error('No agent config found')
-    }
-    handleNewChatMessage(userTextFieldInput, { ...agentConfig })
-  }
+//   const handleDbSearchFiltersChange = useCallback(
+//     (newFilters: DatabaseSearchFilters) => {
+//       setAgentConfig((prevConfig) => {
+//         if (!prevConfig) throw new Error('Agent config must be initialized before setting db search filters')
+//         return { ...prevConfig, dbSearchFilters: newFilters }
+//       })
+//     },
+//     [setAgentConfig],
+//   )
 
-  const handleToolsChange = (tools: ToolDefinition[]) => {
-    setAgentConfig((prevConfig) => {
-      if (!prevConfig) throw new Error('Agent config must be initialized before setting tools')
-      return { ...prevConfig, toolDefinitions: tools }
-    })
-  }
+//   const handleDbSearchToggle = (checked: boolean) => {
+//     setAgentConfig((prevConfig) => {
+//       if (!prevConfig) throw new Error('Agent config must be initialized before setting db search filters')
+//       return {
+//         ...prevConfig,
+//         dbSearchFilters: checked
+//           ? {
+//               limit: 33,
+//               minDate: undefined,
+//               maxDate: undefined,
+//               passFullNoteIntoContext: true,
+//             }
+//           : undefined,
+//       }
+//     })
+//   }
 
-  const handleDbSearchFiltersChange = useCallback((newFilters: DatabaseSearchFilters) => {
-    setAgentConfig((prevConfig) => {
-      if (!prevConfig) throw new Error('Agent config must be initialized before setting db search filters')
-      return { ...prevConfig, dbSearchFilters: newFilters }
-    })
-  }, [])
+//   if (!agentConfig) return <div>Loading...</div>
 
-  const handleDbSearchToggle = (checked: boolean) => {
-    setAgentConfig((prevConfig) => {
-      if (!prevConfig) throw new Error('Agent config must be initialized before setting db search filters')
-      return {
-        ...prevConfig,
-        dbSearchFilters: checked
-          ? {
-              limit: 33,
-              minDate: undefined,
-              maxDate: undefined,
-              passFullNoteIntoContext: true,
-            }
-          : undefined,
-      }
-    })
-  }
+//   return (
+//     <div className="relative flex size-full flex-col items-center overflow-y-auto">
+//       <div className="relative flex flex-col text-center lg:top-10 lg:max-w-4xl">
+//         <div className="flex w-full justify-center">
+//           <img src="icon.png" className="size-16" alt="ReorImage" />
+//         </div>
+//         <h1 className="mb-0 text-[28px] text-foreground">Welcome to your AI second brain.</h1>
+//         <p className="mb-10 mt-1 text-muted-foreground">
+//           Start a chat below. You can provide tools for the LLM to use and customize the system prompt below.{' '}
+//         </p>
+//         <div className="flex w-full">
+//           <div className="mr-4">
+//             <ToolSelector
+//               allTools={allAvailableToolDefinitions}
+//               selectedTools={agentConfig.toolDefinitions}
+//               onToolsChange={handleToolsChange}
+//             />
+//           </div>
+//           <div className="flex flex-col">
+//             <div className="z-50 flex flex-col overflow-hidden rounded border-2 border-solid border-border bg-background focus-within:ring-1 focus-within:ring-ring">
+//               <textarea
+//                 value={userTextFieldInput}
+//                 onKeyDown={(e) => {
+//                   if (!e.shiftKey && e.key === 'Enter') {
+//                     e.preventDefault()
+//                     sendMessageHandler()
+//                   }
+//                 }}
+//                 className="h-[100px] w-[600px] resize-none border-0 bg-transparent p-4 text-foreground caret-current focus:outline-none"
+//                 placeholder="What can Reor help you with today?"
+//                 onChange={(e) => setUserTextFieldInput(e.target.value)}
+//                 // eslint-disable-next-line jsx-a11y/no-autofocus
+//                 autoFocus
+//               />
+//               <div className="mx-auto h-px w-[96%] bg-background/20" />
+//               <div className="flex h-10 flex-col items-center justify-between gap-2  py-2 md:flex-row md:gap-4">
+//                 <div className="flex flex-col items-center justify-between rounded-md border-0 py-2 md:flex-row">
+//                   <LLMSelectOrButton selectedLLM={selectedLLM} setSelectedLLM={setSelectedLLM} />
+//                 </div>
+//                 <div className="flex items-center">
+//                   <Button
+//                     className="m-2 flex items-center justify-between gap-2 bg-transparent text-primary hover:bg-transparent hover:text-accent-foreground"
+//                     onClick={sendMessageHandler}
+//                   >
+//                     <PiPaperPlaneRight className="size-4" />
+//                   </Button>
+//                 </div>
+//               </div>
+//             </div>
 
-  if (!agentConfig) return <div>Loading...</div>
+//             <div
+//               className="mx-auto w-full overflow-hidden rounded-b  border-0 border-solid border-border bg-background transition-all duration-300 ease-in-out"
+//               style={{ maxHeight: '500px' }}
+//             >
+//               <div className="px-4">
+//                 <div className="flex items-center justify-between px-2 py-1">
+//                   <div className="flex items-center space-x-2">
+//                     <span className="text-xs text-muted-foreground">Edit prompt:</span>
+//                     <Popover>
+//                       <PopoverTrigger asChild>
+//                         <Button size="sm" variant="outline" className="bg-border text-primary">
+//                           Prompt
+//                         </Button>
+//                       </PopoverTrigger>
+//                       <PopoverContent className="w-full border border-solid border-muted-foreground bg-background">
+//                         <PromptEditor
+//                           promptTemplate={agentConfig.promptTemplate}
+//                           onSave={(newPromptTemplate) => {
+//                             setAgentConfig((prevConfig) => {
+//                               if (!prevConfig)
+//                                 throw new Error('Agent config must be initialized before setting prompt template')
+//                               return { ...prevConfig, promptTemplate: newPromptTemplate }
+//                             })
+//                           }}
+//                         />
+//                       </PopoverContent>
+//                     </Popover>
+//                   </div>
 
-  return (
-    <div className="relative flex size-full flex-col items-center overflow-y-auto">
-      <div className="relative flex flex-col text-center lg:top-10 lg:max-w-4xl">
-        <div className="flex w-full justify-center">
-          <img src="icon.png" className="size-16" alt="ReorImage" />
-        </div>
-        <h1 className="mb-0 text-[28px] text-foreground">Welcome to your AI second brain.</h1>
-        <p className="mb-10 mt-1 text-muted-foreground">
-          Start a chat below. You can provide tools for the LLM to use and customize the system prompt below.{' '}
-        </p>
-        <div className="flex w-full">
-          <div className="mr-4">
-            <ToolSelector
-              allTools={allAvailableToolDefinitions}
-              selectedTools={agentConfig.toolDefinitions}
-              onToolsChange={handleToolsChange}
-            />
-          </div>
-          <div className="flex flex-col">
-            <div className="z-50 flex flex-col overflow-hidden rounded border-2 border-solid border-border bg-background focus-within:ring-1 focus-within:ring-ring">
-              <textarea
-                value={userTextFieldInput}
-                onKeyDown={(e) => {
-                  if (!e.shiftKey && e.key === 'Enter') {
-                    e.preventDefault()
-                    sendMessageHandler()
-                  }
-                }}
-                className="h-[100px] w-[600px] resize-none border-0 bg-transparent p-4 text-foreground caret-current focus:outline-none"
-                placeholder="What can Reor help you with today?"
-                onChange={(e) => setUserTextFieldInput(e.target.value)}
-                // eslint-disable-next-line jsx-a11y/no-autofocus
-                autoFocus
-              />
-              <div className="mx-auto h-px w-[96%] bg-background/20" />
-              <div className="flex h-10 flex-col items-center justify-between gap-2  py-2 md:flex-row md:gap-4">
-                <div className="flex flex-col items-center justify-between rounded-md border-0 py-2 md:flex-row">
-                  <LLMSelectOrButton
-                    llmConfigs={llmConfigs}
-                    selectedLLM={selectedLLM}
-                    setSelectedLLM={setSelectedLLM}
-                    setLLMConfigs={setLLMConfigs}
-                  />
-                </div>
-                <div className="flex items-center">
-                  <Button
-                    className="m-2 flex items-center justify-between gap-2 bg-transparent text-primary hover:bg-transparent hover:text-accent-foreground"
-                    onClick={sendMessageHandler}
-                  >
-                    <PiPaperPlaneRight className="size-4" />
-                  </Button>
-                </div>
-              </div>
-            </div>
+//                   <div className="flex items-center">
+//                     <div className="flex items-center">
+//                       <Switch
+//                         id="db-search-toggle"
+//                         checked={!!agentConfig.dbSearchFilters}
+//                         onCheckedChange={handleDbSearchToggle}
+//                         className="scale-75"
+//                       />
+//                       <Label htmlFor="db-search-toggle" className="ml-1 text-xs text-muted-foreground">
+//                         Make knowledge base search
+//                       </Label>
+//                     </div>
+//                     <Drawer>
+//                       <DrawerTrigger asChild>
+//                         <Button
+//                           variant="secondary"
+//                           size="icon"
+//                           className="ml-1 size-8 rounded-full"
+//                           disabled={!agentConfig.dbSearchFilters}
+//                         >
+//                           {' '}
+//                           <FiSettings className="size-3" />
+//                           <span className="sr-only">Open DB search settings</span>
+//                         </Button>
+//                       </DrawerTrigger>
+//                       <DrawerContent>
+//                         <DrawerHeader>
+//                           <DrawerTitle>Database Search Filters</DrawerTitle>
+//                           <DrawerDescription>Configure your database search filters</DrawerDescription>
+//                         </DrawerHeader>
+//                         {agentConfig.dbSearchFilters && (
+//                           <DbSearchFilters
+//                             dbSearchFilters={agentConfig.dbSearchFilters}
+//                             onFiltersChange={handleDbSearchFiltersChange}
+//                           />
+//                         )}
+//                         <DrawerFooter>
+//                           <Button
+//                             onClick={() =>
+//                               setAgentConfig((prev) => {
+//                                 if (!prev) throw new Error('Agent config must be initialized')
+//                                 return { ...prev, dbSearchFilters: prev.dbSearchFilters }
+//                               })
+//                             }
+//                           >
+//                             Save Changes
+//                           </Button>
+//                           <DrawerClose asChild>
+//                             <Button variant="outline">Cancel</Button>
+//                           </DrawerClose>
+//                         </DrawerFooter>
+//                       </DrawerContent>
+//                     </Drawer>
+//                   </div>
+//                 </div>
+//               </div>
+//             </div>
 
-            <div
-              className="mx-auto w-full overflow-hidden rounded-b  border-0 border-solid border-border bg-background transition-all duration-300 ease-in-out"
-              style={{ maxHeight: '500px' }}
-            >
-              <div className="px-4">
-                <div className="flex items-center justify-between px-2 py-1">
-                  <div className="flex items-center space-x-2">
-                    <span className="text-xs text-muted-foreground">Edit prompt:</span>
-                    <Popover>
-                      <PopoverTrigger asChild>
-                        <Button size="sm" variant="outline" className="bg-border text-primary">
-                          Prompt
-                        </Button>
-                      </PopoverTrigger>
-                      <PopoverContent className="w-full border border-solid border-muted-foreground bg-background">
-                        <PromptEditor
-                          promptTemplate={agentConfig.promptTemplate}
-                          onSave={(newPromptTemplate) => {
-                            setAgentConfig((prevConfig) => {
-                              if (!prevConfig)
-                                throw new Error('Agent config must be initialized before setting prompt template')
-                              return { ...prevConfig, promptTemplate: newPromptTemplate }
-                            })
-                          }}
-                        />
-                      </PopoverContent>
-                    </Popover>
-                  </div>
+//             {/* New suggestion cards */}
+//             <div className="mt-10 grid grid-cols-3 gap-4">
+//               {promptSuggestions.map((suggestion, index) => (
+//                 <SuggestionCard
+//                   // eslint-disable-next-line react/no-array-index-key
+//                   key={index}
+//                   suggestion={suggestion}
+//                   onClick={() => {
+//                     setUserTextFieldInput(suggestion)
+//                     sendMessageHandler()
+//                   }}
+//                 />
+//               ))}
+//             </div>
+//           </div>
+//         </div>
+//       </div>
+//     </div>
+//   )
+// }
 
-                  <div className="flex items-center">
-                    <div className="flex items-center">
-                      <Switch
-                        id="db-search-toggle"
-                        checked={!!agentConfig.dbSearchFilters}
-                        onCheckedChange={handleDbSearchToggle}
-                        className="scale-75"
-                      />
-                      <Label htmlFor="db-search-toggle" className="ml-1 text-xs text-muted-foreground">
-                        Make knowledge base search
-                      </Label>
-                    </div>
-                    <Drawer>
-                      <DrawerTrigger asChild>
-                        <Button
-                          variant="secondary"
-                          size="icon"
-                          className="ml-1 size-8 rounded-full"
-                          disabled={!agentConfig.dbSearchFilters}
-                        >
-                          {' '}
-                          <FiSettings className="size-3" />
-                          <span className="sr-only">Open DB search settings</span>
-                        </Button>
-                      </DrawerTrigger>
-                      <DrawerContent>
-                        <DrawerHeader>
-                          <DrawerTitle>Database Search Filters</DrawerTitle>
-                          <DrawerDescription>Configure your database search filters</DrawerDescription>
-                        </DrawerHeader>
-                        {agentConfig.dbSearchFilters && (
-                          <DbSearchFilters
-                            dbSearchFilters={agentConfig.dbSearchFilters}
-                            onFiltersChange={handleDbSearchFiltersChange}
-                          />
-                        )}
-                        <DrawerFooter>
-                          <Button
-                            onClick={() =>
-                              setAgentConfig((prev) => {
-                                if (!prev) throw new Error('Agent config must be initialized')
-                                return { ...prev, dbSearchFilters: prev.dbSearchFilters }
-                              })
-                            }
-                          >
-                            Save Changes
-                          </Button>
-                          <DrawerClose asChild>
-                            <Button variant="outline">Cancel</Button>
-                          </DrawerClose>
-                        </DrawerFooter>
-                      </DrawerContent>
-                    </Drawer>
-                  </div>
-                </div>
-              </div>
-            </div>
-
-            {/* New suggestion cards */}
-            <div className="mt-10 grid grid-cols-3 gap-4">
-              {promptSuggestions.map((suggestion, index) => (
-                <SuggestionCard
-                  // eslint-disable-next-line react/no-array-index-key
-                  key={index}
-                  suggestion={suggestion}
-                  onClick={() => {
-                    setUserTextFieldInput(suggestion)
-                    sendMessageHandler()
-                  }}
-                />
-              ))}
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
-
-export default StartChat
+// export default StartChat
diff --git a/src/components/Chat/index.tsx b/src/components/Chat/index.tsx
index 58adf4b1..3b852454 100644
--- a/src/components/Chat/index.tsx
+++ b/src/components/Chat/index.tsx
@@ -4,7 +4,7 @@ import { streamText } from 'ai'
 import { toast } from 'react-toastify'
 import {
   appendStringContentToMessages,
-  appendToOrCreateChat as updateOrCreateChat,
+  appendToOrCreateChat,
   removeUncalledToolsFromMessages,
 } from '../../lib/llm/chat'
 
@@ -12,31 +12,15 @@ import '../../styles/chat.css'
 import ChatMessages from './ChatMessages'
 import { Chat, AgentConfig, LoadingState } from '../../lib/llm/types'
 import { useChatContext } from '@/contexts/ChatContext'
-import StartChat from './StartChat'
 import resolveLLMClient from '@/lib/llm/client'
 import { appendToolCallsAndAutoExecuteTools, convertToolConfigToZodSchema } from '../../lib/llm/tools/utils'
-import useResizeObserver from '@/lib/hooks/use-resize-observer'
 
 const ChatComponent: React.FC = () => {
   const [loadingState, setLoadingState] = useState<LoadingState>('idle')
-  const [defaultModelName, setDefaultLLMName] = useState<string>('')
-  const [containerWidth, setContainerWidth] = useState<number>(0)
   const containerRef = useRef<HTMLDivElement>(null)
   const { currentChat, setCurrentChat, saveChat } = useChatContext()
   const abortControllerRef = useRef<AbortController | null>(null)
 
-  useResizeObserver(containerRef, (entry) => {
-    setContainerWidth(entry.contentRect.width)
-  })
-
-  useEffect(() => {
-    const fetchDefaultLLM = async () => {
-      const defaultName = await window.llm.getDefaultLLMName()
-      setDefaultLLMName(defaultName)
-    }
-    fetchDefaultLLM()
-  }, [])
-
   useEffect(() => {
     const fetchChat = async () => {
       if (abortControllerRef.current) {
@@ -48,15 +32,16 @@ const ChatComponent: React.FC = () => {
   }, [currentChat?.id, saveChat])
 
   const handleNewChatMessage = useCallback(
-    async (chat: Chat | undefined, userTextFieldInput?: string, agentConfig?: AgentConfig) => {
+    async (chat: Chat | undefined, llmName: string, userTextFieldInput?: string, agentConfig?: AgentConfig) => {
       let outputChat: Chat | undefined
       try {
-        const defaultLLMName = await window.llm.getDefaultLLMName()
         if (!userTextFieldInput?.trim() && (!chat || chat.messages.length === 0)) {
           return
         }
 
-        outputChat = userTextFieldInput?.trim() ? await updateOrCreateChat(chat, userTextFieldInput, agentConfig) : chat
+        outputChat = userTextFieldInput?.trim()
+          ? await appendToOrCreateChat(chat, userTextFieldInput, agentConfig)
+          : chat
 
         if (!outputChat) {
           return
@@ -65,7 +50,7 @@ const ChatComponent: React.FC = () => {
         setCurrentChat(outputChat)
         await saveChat(outputChat)
 
-        const llmClient = await resolveLLMClient(defaultLLMName)
+        const llmClient = await resolveLLMClient(llmName)
         abortControllerRef.current = new AbortController()
         const toolsZodSchema = Object.assign({}, ...outputChat.toolDefinitions.map(convertToolConfigToZodSchema))
         setLoadingState('waiting-for-first-token')
@@ -103,7 +88,7 @@ const ChatComponent: React.FC = () => {
           setCurrentChat(outputChat)
           await saveChat(outputChat)
           if (allToolCallsHaveBeenExecuted) {
-            handleNewChatMessage(outputChat, undefined, agentConfig)
+            handleNewChatMessage(outputChat, llmName, undefined, agentConfig)
           }
         }
 
@@ -126,7 +111,7 @@ const ChatComponent: React.FC = () => {
             )
             const agentWithoutTools = { ...agentConfig, toolDefinitions: [] }
             outputChat.toolDefinitions = []
-            handleNewChatMessage(outputChat, undefined, agentWithoutTools)
+            handleNewChatMessage(outputChat, llmName, undefined, agentWithoutTools)
             return
           }
         }
@@ -143,37 +128,14 @@ const ChatComponent: React.FC = () => {
   return (
     <div ref={containerRef} className="flex size-full items-center justify-center">
       <div className="mx-auto flex size-full flex-col overflow-hidden bg-background">
-        {currentChat && currentChat.messages && currentChat.messages.length > 0 ? (
-          <ChatMessages
-            currentChat={currentChat}
-            setCurrentChat={setCurrentChat}
-            loadingState={loadingState}
-            handleNewChatMessage={(userTextFieldInput?: string, chatFilters?: AgentConfig) =>
-              handleNewChatMessage(currentChat, userTextFieldInput, chatFilters)
-            }
-          />
-        ) : (
-          // eslint-disable-next-line react/jsx-no-useless-fragment
-          <>
-            {containerWidth > 600 ? (
-              <StartChat
-                defaultModelName={defaultModelName}
-                handleNewChatMessage={(userTextFieldInput?: string, agentConfig?: AgentConfig) =>
-                  handleNewChatMessage(undefined, userTextFieldInput, agentConfig)
-                }
-              />
-            ) : (
-              <ChatMessages
-                currentChat={currentChat}
-                setCurrentChat={setCurrentChat}
-                loadingState={loadingState}
-                handleNewChatMessage={(userTextFieldInput?: string, chatFilters?: AgentConfig) =>
-                  handleNewChatMessage(currentChat, userTextFieldInput, chatFilters)
-                }
-              />
-            )}
-          </>
-        )}
+        <ChatMessages
+          currentChat={currentChat}
+          setCurrentChat={setCurrentChat}
+          loadingState={loadingState}
+          handleNewChatMessage={(llmName: string, userTextFieldInput?: string, agentConfig?: AgentConfig) =>
+            handleNewChatMessage(currentChat, llmName, userTextFieldInput, agentConfig)
+          }
+        />
       </div>
     </div>
   )
diff --git a/src/components/File/DBResultPreview.tsx b/src/components/File/DBResultPreview.tsx
index 0f3f5d78..3cae494b 100644
--- a/src/components/File/DBResultPreview.tsx
+++ b/src/components/File/DBResultPreview.tsx
@@ -55,7 +55,7 @@ export const DBSearchPreview: React.FC<DBSearchPreviewProps> = ({ dbResult: entr
 
   return (
     <div
-      className="mb-4 mt-0 max-w-full cursor-pointer overflow-hidden rounded border border-gray-600 bg-neutral-800 p-2 shadow-md transition-transform duration-300 hover:bg-neutral-500 hover:shadow-lg"
+      className="mb-4 mt-0 max-w-full cursor-pointer overflow-hidden rounded border border-gray-600 bg-neutral-800 p-2 shadow-md transition-transform duration-300 hover:bg-neutral-700 hover:shadow-lg"
       onClick={() => onSelect(entry.notepath)}
     >
       <div className="text-sm text-gray-200">
diff --git a/src/components/Settings/GeneralSettings.tsx b/src/components/Settings/GeneralSettings.tsx
index 2c018b83..d09ecf81 100644
--- a/src/components/Settings/GeneralSettings.tsx
+++ b/src/components/Settings/GeneralSettings.tsx
@@ -45,7 +45,6 @@ export const AppearanceSection = () => {
 }
 
 export const EditorSection = () => {
-  // const { spellCheckEnabled, setSpellCheckEnabled } = useFileByFilepath()
   const [tempSpellCheckEnabled, setTempSpellCheckEnabled] = useState(false)
   const [documentStatsEnabled, setDocumentStatsEnabled] = useState(false)
   const [editorFlexCenter, setEditorFlexCenter] = useState<boolean>(true)
@@ -56,7 +55,6 @@ export const EditorSection = () => {
       const isDocumentStatsCheckEnabled = await window.electronStore.getDocumentStats()
 
       if (isSpellCheckEnabled !== undefined) {
-        // setSpellCheckEnabled(isSpellCheckEnabled)
         setTempSpellCheckEnabled(isSpellCheckEnabled)
       }
       if (isDocumentStatsCheckEnabled !== undefined) {
diff --git a/src/components/Settings/LLMSettings/LLMSelectOrButton.tsx b/src/components/Settings/LLMSettings/LLMSelectOrButton.tsx
index c526b47d..7a2e4053 100644
--- a/src/components/Settings/LLMSettings/LLMSelectOrButton.tsx
+++ b/src/components/Settings/LLMSettings/LLMSelectOrButton.tsx
@@ -1,23 +1,16 @@
 import React, { useState } from 'react'
-import { FiRefreshCw } from 'react-icons/fi'
-import { LLMConfig } from 'electron/main/electron-store/storeConfig'
 import { Button } from '@/components/ui/button'
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
 import SettingsModal, { SettingsTab } from '../Settings'
+import useLLMConfigs from '@/lib/hooks/use-llm-configs'
 
 interface LLMSelectOrButtonProps {
-  llmConfigs: Array<{ modelName: string }>
-  selectedLLM: string
-  setSelectedLLM: (value: string) => void
-  setLLMConfigs: React.Dispatch<React.SetStateAction<LLMConfig[]>>
+  selectedLLM: string | undefined
+  setSelectedLLM: (value: string | undefined) => void
 }
 
-const LLMSelectOrButton: React.FC<LLMSelectOrButtonProps> = ({
-  llmConfigs,
-  selectedLLM,
-  setSelectedLLM,
-  setLLMConfigs,
-}) => {
+const LLMSelectOrButton: React.FC<LLMSelectOrButtonProps> = ({ selectedLLM, setSelectedLLM }) => {
+  const { llmConfigs } = useLLMConfigs()
   const handleLLMChange = (value: string) => {
     setSelectedLLM(value)
   }
@@ -38,11 +31,6 @@ const LLMSelectOrButton: React.FC<LLMSelectOrButtonProps> = ({
     openModalWithTab(SettingsTab.LLMSettingsTab)
   }
 
-  const refreshLLMConfigs = async () => {
-    const LLMConfigs = await window.llm.getLLMConfigs()
-    setLLMConfigs(LLMConfigs)
-  }
-
   return (
     <div className="text-left">
       <div className="flex items-center">
@@ -52,19 +40,22 @@ const LLMSelectOrButton: React.FC<LLMSelectOrButtonProps> = ({
           </Button>
         ) : (
           <Select value={selectedLLM} onValueChange={(value) => handleLLMChange(value)}>
-            <SelectTrigger className="w-32 ">
+            <SelectTrigger className="h-7 w-32 border-0 text-[10px] text-gray-300 focus:ring-0 focus:ring-offset-0">
               <SelectValue placeholder="Select LLM" />
             </SelectTrigger>
-            <SelectContent>
+            <SelectContent className="rounded-md border border-dark-gray-c-eight bg-[#1c1c1c]">
               {llmConfigs.map((llm) => (
-                <SelectItem key={llm.modelName} value={llm.modelName}>
+                <SelectItem
+                  key={llm.modelName}
+                  value={llm.modelName}
+                  className="cursor-pointer text-[10px] text-gray-300 hover:bg-[#252525] focus:bg-[#252525] focus:text-gray-200"
+                >
                   {llm.modelName}
                 </SelectItem>
               ))}
             </SelectContent>
           </Select>
         )}
-        <FiRefreshCw onClick={refreshLLMConfigs} className="ml-1 cursor-pointer text-xs text-gray-400" />
         <SettingsModal isOpen={isSettingsModalOpen} onClose={closeModal} initialTab={activeTab} />
       </div>
     </div>
diff --git a/src/components/TitleBar/TitleBar.tsx b/src/components/TitleBar/TitleBar.tsx
index e07229bd..b710178d 100644
--- a/src/components/TitleBar/TitleBar.tsx
+++ b/src/components/TitleBar/TitleBar.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import { PiSidebarFill } from 'react-icons/pi'
+import { BsChatLeftDots, BsChatLeftDotsFill } from 'react-icons/bs'
 import FileHistoryNavigator from './NavigationButtons'
 import ExternalLink from '../Common/ExternalLink'
 import { useChatContext } from '@/contexts/ChatContext'
@@ -7,7 +7,7 @@ import { useChatContext } from '@/contexts/ChatContext'
 export const titleBarHeight = '30px'
 
 const TitleBar: React.FC = () => {
-  const { setShowChatbot } = useChatContext()
+  const { showChatbot, setShowChatbot } = useChatContext()
   const [platform, setPlatform] = useState('')
 
   useEffect(() => {
@@ -32,12 +32,21 @@ const TitleBar: React.FC = () => {
         <ExternalLink href="https://forms.gle/8H4GtEcE6MBnNAUa7" className="decoration-gray-200">
           <span className="mr-2 cursor-pointer text-sm text-gray-200 hover:text-gray-300">Feedback</span>
         </ExternalLink>
-        <PiSidebarFill
-          className="electron-no-drag mt-[0.2rem] -scale-x-100 cursor-pointer text-gray-100"
-          size={22}
-          title="Hide Similar Files"
-          onClick={() => setShowChatbot((show) => !show)}
-        />
+        {showChatbot ? (
+          <BsChatLeftDotsFill
+            className="electron-no-drag mr-1 mt-[0.2rem] -scale-x-100 cursor-pointer p-[2px] text-gray-100"
+            size={22}
+            title="Hide Similar Files"
+            onClick={() => setShowChatbot((show) => !show)}
+          />
+        ) : (
+          <BsChatLeftDots
+            className="electron-no-drag mr-1 mt-[0.2rem] -scale-x-100 cursor-pointer p-[2px] text-gray-100"
+            size={22}
+            title="Show Chatbot"
+            onClick={() => setShowChatbot((show) => !show)}
+          />
+        )}
       </div>
     </div>
   )
diff --git a/src/lib/hooks/use-agent-configs.ts b/src/lib/hooks/use-agent-configs.ts
new file mode 100644
index 00000000..ed996675
--- /dev/null
+++ b/src/lib/hooks/use-agent-configs.ts
@@ -0,0 +1,31 @@
+import { useState, useEffect } from 'react'
+import { AgentConfig } from '../llm/types'
+import exampleAgents from '@/components/Chat/ChatConfigComponents/exampleAgents'
+
+interface UseAgentConfigReturn {
+  agentConfig: AgentConfig | undefined
+  setAgentConfig: React.Dispatch<React.SetStateAction<AgentConfig | undefined>>
+}
+
+function useAgentConfig(): UseAgentConfigReturn {
+  const [agentConfig, setAgentConfig] = useState<AgentConfig>()
+
+  useEffect(() => {
+    const fetchAgentConfigs = async () => {
+      const agentConfigs = await window.electronStore.getAgentConfigs()
+      if (agentConfigs && agentConfigs.length > 0) {
+        setAgentConfig(agentConfigs[0])
+      } else {
+        setAgentConfig(exampleAgents[0])
+      }
+    }
+    fetchAgentConfigs()
+  }, [])
+
+  return {
+    agentConfig,
+    setAgentConfig,
+  }
+}
+
+export default useAgentConfig
diff --git a/src/lib/hooks/use-llm-configs.ts b/src/lib/hooks/use-llm-configs.ts
index cd79591d..65d1f41e 100644
--- a/src/lib/hooks/use-llm-configs.ts
+++ b/src/lib/hooks/use-llm-configs.ts
@@ -1,26 +1,35 @@
-import { useState, useEffect } from 'react'
+import { useState, useEffect, useCallback } from 'react'
 
 import { LLMConfig } from 'electron/main/electron-store/storeConfig'
 
 const useLLMConfigs = () => {
   const [llmConfigs, setLLMConfigs] = useState<LLMConfig[]>([])
-  const [defaultLLM, setDefaultLLM] = useState<string>('')
+  const [defaultLLM, setDefaultLocalLLM] = useState<string>('')
 
-  const fetchAndUpdateModelConfigs = async () => {
+  const fetchAndUpdateModelConfigs = useCallback(async () => {
     const fetchedLLMConfigs = await window.llm.getLLMConfigs()
     setLLMConfigs(fetchedLLMConfigs)
     const storedDefaultLLM = await window.llm.getDefaultLLMName()
     if (!storedDefaultLLM && fetchedLLMConfigs.length > 0) {
       await window.llm.setDefaultLLM(fetchedLLMConfigs[0].modelName)
-      setDefaultLLM(fetchedLLMConfigs[0].modelName)
+      setDefaultLocalLLM(fetchedLLMConfigs[0].modelName)
     } else {
-      setDefaultLLM(storedDefaultLLM)
+      setDefaultLocalLLM(storedDefaultLLM)
     }
+  }, [])
+
+  useEffect(() => {
+    window.ipcRenderer.on('llm-configs-changed', fetchAndUpdateModelConfigs)
+  }, [fetchAndUpdateModelConfigs])
+
+  const setDefaultLLM = async (modelName: string) => {
+    await window.llm.setDefaultLLM(modelName)
+    setDefaultLocalLLM(modelName)
   }
 
   useEffect(() => {
     fetchAndUpdateModelConfigs()
-  }, [])
+  }, [fetchAndUpdateModelConfigs])
 
   return {
     llmConfigs,
diff --git a/src/lib/llm/chat.ts b/src/lib/llm/chat.ts
index 9f4103b7..eff244d2 100644
--- a/src/lib/llm/chat.ts
+++ b/src/lib/llm/chat.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-param-reassign */
 import { DBEntry } from 'electron/main/vector-database/schema'
 import { FileInfoWithContent } from 'electron/main/filesystem/types'
 import { generateChatName } from '@shared/utils'
@@ -77,61 +78,78 @@ export function anonymizeAgentConfigForPosthog(
 
 const generateStringOfContextItemsForPrompt = (contextItems: DBEntry[] | FileInfoWithContent[]): string => {
   const contextString = contextItems.map((item) => JSON.stringify(item, null, 2)).join('\n\n')
-  return `<context>${contextString}</context>`
+  return `${contextString}`
+}
+
+const replaceTemplatePlaceholders = (content: string, userQuery: string) => {
+  const now = new Date()
+  const today = format(now, "yyyy-MM-dd'T'HH:mm:ss.SSSxxx")
+  return content.replace('{QUERY}', userQuery).replace('{TODAY}', today)
 }
 
 const generateMessagesFromTemplate = (
   promptTemplate: PromptTemplate,
-  query: string,
+  userQuery: string,
   contextItems: DBEntry[] | FileInfoWithContent[],
-  contextString: string,
 ): ReorChatMessage[] => {
-  return promptTemplate.map((message) => {
-    const replacePlaceholders = (content: string) => {
-      const now = new Date()
-      const today = format(now, "yyyy-MM-dd'T'HH:mm:ss.SSSxxx")
-      return content.replace('{QUERY}', query).replace('{TODAY}', today)
-    }
-
-    if (message.role === 'system') {
+  return promptTemplate.map((templateMessage) => {
+    if (templateMessage.role === 'system') {
       return {
-        ...message,
-        content: `${replacePlaceholders(message.content)}\n\n${contextString}`,
+        ...templateMessage,
+        content: `${replaceTemplatePlaceholders(templateMessage.content, userQuery)}`,
         hideMessage: true,
       }
     }
 
-    if (message.role === 'user') {
+    if (templateMessage.role === 'user') {
       return {
-        ...message,
+        ...templateMessage,
         context: contextItems,
-        content: replacePlaceholders(message.content),
-        visibleContent: query,
+        content: replaceTemplatePlaceholders(templateMessage.content, userQuery),
+        visibleContent: userQuery,
       }
     }
 
-    return message
+    return templateMessage
   }) as ReorChatMessage[]
 }
 
-export const doInitialRAG = async (query: string, agentConfig: AgentConfig): Promise<ReorChatMessage[]> => {
-  const { promptTemplate, files } = agentConfig
-  let contextItems: DBEntry[] | FileInfoWithContent[] = []
+const injectContextStringIntoMessages = (
+  messages: ReorChatMessage[],
+  contextItems: DBEntry[] | FileInfoWithContent[],
+  contextString: string,
+): ReorChatMessage[] => {
+  const lastUserMessage = messages.findLast((message) => message.role === 'user')
+  if (lastUserMessage) {
+    lastUserMessage.content = `The context retrieved from the user's knowledge base for the query is: ${contextString}\n\n${lastUserMessage.content}`
+    lastUserMessage.context = contextItems
+  }
+  return messages
+}
+
+const retrieveContextItems = async (
+  query: string,
+  agentConfig: AgentConfig,
+): Promise<DBEntry[] | FileInfoWithContent[]> => {
+  const { files } = agentConfig
 
   if (files.length > 0) {
-    contextItems = await window.fileSystem.getFiles(files)
-  } else if (agentConfig.dbSearchFilters) {
-    contextItems = await retreiveFromVectorDB(query, agentConfig.dbSearchFilters)
+    return window.fileSystem.getFiles(files)
   }
 
-  const contextString = generateStringOfContextItemsForPrompt(contextItems)
-  const messages = generateMessagesFromTemplate(promptTemplate, query, contextItems, contextString)
+  if (agentConfig.dbSearchFilters) {
+    return retreiveFromVectorDB(query, agentConfig.dbSearchFilters)
+  }
 
-  return messages
+  return []
 }
 
 export const generateInitialChat = async (userTextFieldInput: string, agentConfig: AgentConfig): Promise<Chat> => {
-  const ragMessages = await doInitialRAG(userTextFieldInput ?? '', agentConfig)
+  const contextItems = await retrieveContextItems(userTextFieldInput ?? '', agentConfig)
+
+  const contextString = generateStringOfContextItemsForPrompt(contextItems)
+  const messages = generateMessagesFromTemplate(agentConfig.promptTemplate, userTextFieldInput ?? '', contextItems)
+  const ragMessages = injectContextStringIntoMessages(messages, contextItems, contextString)
 
   return {
     id: Date.now().toString(),
@@ -141,6 +159,32 @@ export const generateInitialChat = async (userTextFieldInput: string, agentConfi
     toolDefinitions: agentConfig.toolDefinitions,
   }
 }
+
+const generateFollowUpChat = async (
+  currentChat: Chat | undefined,
+  userTextFieldInput: string,
+  agentConfig: AgentConfig | undefined,
+): Promise<Chat> => {
+  if (!currentChat) {
+    throw new Error('Current chat is required')
+  }
+  currentChat.messages.push({
+    role: 'user',
+    visibleContent: userTextFieldInput,
+    content: `The user's query is: ${userTextFieldInput}`,
+    context: [],
+  })
+
+  if (agentConfig) {
+    const contextItems = await retrieveContextItems(userTextFieldInput ?? '', agentConfig)
+    const contextString = generateStringOfContextItemsForPrompt(contextItems)
+    currentChat.messages = injectContextStringIntoMessages(currentChat.messages, contextItems, contextString)
+    currentChat.toolDefinitions = agentConfig.toolDefinitions
+  }
+
+  return currentChat
+}
+
 export const appendToOrCreateChat = async (
   currentChat: Chat | undefined,
   userTextFieldInput: string,
@@ -160,11 +204,7 @@ export const appendToOrCreateChat = async (
       ...anonymizedAgentConfig,
     })
   } else {
-    outputChat.messages.push({
-      role: 'user',
-      content: userTextFieldInput,
-      context: [],
-    })
+    outputChat = await generateFollowUpChat(outputChat, userTextFieldInput, agentConfig)
     posthog.capture('follow_up_chat_message_submitted', {
       chatId: outputChat?.id,
       chatLength: outputChat?.messages.length,
@@ -174,10 +214,6 @@ export const appendToOrCreateChat = async (
   return outputChat
 }
 
-export const getClassNameBasedOnMessageRole = (message: ReorChatMessage): string => {
-  return `markdown-content ${message.role}-chat-message`
-}
-
 export const getDisplayMessage = (message: ReorChatMessage): string | undefined => {
   if (message.hideMessage) {
     return undefined
diff --git a/vite.config.ts b/vite.config.ts
index 07228bb0..d9f36bd4 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -5,6 +5,7 @@ import react from '@vitejs/plugin-react'
 import { defineConfig } from 'vite'
 import electron from 'vite-plugin-electron'
 import renderer from 'vite-plugin-electron-renderer'
+import { sentryVitePlugin } from "@sentry/vite-plugin"
 
 import pkg from './package.json'
 
@@ -14,7 +15,7 @@ export default defineConfig(({ command }) => {
 
   const isServe = command === 'serve'
   const isBuild = command === 'build'
-  const sourcemap = isServe || !!process.env.VSCODE_DEBUG
+  const sourcemap = true
 
   return {
     resolve: {
@@ -81,6 +82,11 @@ export default defineConfig(({ command }) => {
         },
       ]),
       renderer(),
+      sentryVitePlugin({
+        authToken: process.env.SENTRY_AUTH_TOKEN,
+        org: "reor",
+        project: "electron",
+      }),
     ],
     css: {
       postcss: {
@@ -97,5 +103,8 @@ export default defineConfig(({ command }) => {
         }
       })(),
     clearScreen: false,
+    build: {
+      sourcemap: true,
+    },
   }
 })
\ No newline at end of file