diff --git a/src/components/Common/AdvanceOllamaSettings.tsx b/src/components/Common/Settings/AdvanceOllamaSettings.tsx
similarity index 100%
rename from src/components/Common/AdvanceOllamaSettings.tsx
rename to src/components/Common/Settings/AdvanceOllamaSettings.tsx
diff --git a/src/components/Common/CurrentChatModelSettings.tsx b/src/components/Common/Settings/CurrentChatModelSettings.tsx
similarity index 100%
rename from src/components/Common/CurrentChatModelSettings.tsx
rename to src/components/Common/Settings/CurrentChatModelSettings.tsx
diff --git a/src/components/Layouts/Layout.tsx b/src/components/Layouts/Layout.tsx
index 200d0ef..9ff5fcc 100644
--- a/src/components/Layouts/Layout.tsx
+++ b/src/components/Layouts/Layout.tsx
@@ -25,7 +25,7 @@ import { useStorage } from "@plasmohq/storage/hook"
 import { ModelSelect } from "../Common/ModelSelect"
 import { PromptSelect } from "../Common/PromptSelect"
 import { ChatSettings } from "../Icons/ChatSettings"
-import { CurrentChatModelSettings } from "../Common/CurrentChatModelSettings"
+import { CurrentChatModelSettings } from "../Common/Settings/CurrentChatModelSettings"
 
 export default function OptionLayout({
   children
diff --git a/src/components/Option/Settings/model-settings.tsx b/src/components/Option/Settings/model-settings.tsx
index a7ee8ef..8db7661 100644
--- a/src/components/Option/Settings/model-settings.tsx
+++ b/src/components/Option/Settings/model-settings.tsx
@@ -1,7 +1,7 @@
 import { SaveButton } from "@/components/Common/SaveButton"
 import { getAllModelSettings, setModelSetting } from "@/services/model-settings"
 import { useQuery, useQueryClient } from "@tanstack/react-query"
-import { Form, Skeleton, Input, Switch, InputNumber, Collapse } from "antd"
+import { Form, Skeleton, Input, InputNumber, Collapse } from "antd"
 import React from "react"
 import { useTranslation } from "react-i18next"
 // keepAlive?: string
diff --git a/src/components/Option/Settings/ollama.tsx b/src/components/Option/Settings/ollama.tsx
index 688ae96..3315a1f 100644
--- a/src/components/Option/Settings/ollama.tsx
+++ b/src/components/Option/Settings/ollama.tsx
@@ -14,7 +14,7 @@ import {
 import { SettingPrompt } from "./prompt"
 import { Trans, useTranslation } from "react-i18next"
 import { useStorage } from "@plasmohq/storage/hook"
-import { AdvanceOllamaSettings } from "@/components/Common/AdvanceOllamaSettings"
+import { AdvanceOllamaSettings } from "@/components/Common/Settings/AdvanceOllamaSettings"
 import { ModelSettings } from "./model-settings"
 
 export const SettingsOllama = () => {
diff --git a/src/components/Option/Settings/other.tsx b/src/components/Option/Settings/other.tsx
index edb4349..d4c7c25 100644
--- a/src/components/Option/Settings/other.tsx
+++ b/src/components/Option/Settings/other.tsx
@@ -29,7 +29,7 @@ export const SettingOther = () => {
     <dl className="flex flex-col space-y-6 text-sm">
       <div>
         <h2 className="text-base font-semibold leading-7 text-gray-900 dark:text-white">
-          {t("generalSettings.settings.heading")}
+          {t("generalSettings.title")}
         </h2>
         <div className="border border-b border-gray-200 dark:border-gray-600 mt-3"></div>
       </div>
diff --git a/src/components/Sidepanel/Chat/header.tsx b/src/components/Sidepanel/Chat/header.tsx
index d714627..c90cadb 100644
--- a/src/components/Sidepanel/Chat/header.tsx
+++ b/src/components/Sidepanel/Chat/header.tsx
@@ -4,7 +4,7 @@ import { Link } from "react-router-dom"
 import { Tooltip } from "antd"
 import { BoxesIcon, BrainCog, CogIcon, EraserIcon } from "lucide-react"
 import { useTranslation } from "react-i18next"
-import { CurrentChatModelSettings } from "@/components/Common/CurrentChatModelSettings"
+import { CurrentChatModelSettings } from "@/components/Common/Settings/CurrentChatModelSettings"
 import React from "react"
 export const SidepanelHeader = () => {
   const { clearChat, isEmbedding, messages, streaming } = useMessage()
diff --git a/src/components/Sidepanel/Settings/body.tsx b/src/components/Sidepanel/Settings/body.tsx
index 8d177de..88f4450 100644
--- a/src/components/Sidepanel/Settings/body.tsx
+++ b/src/components/Sidepanel/Settings/body.tsx
@@ -23,7 +23,7 @@ import { MoonIcon, SunIcon } from "lucide-react"
 import { Trans, useTranslation } from "react-i18next"
 import { useI18n } from "@/hooks/useI18n"
 import { TTSModeSettings } from "@/components/Option/Settings/tts-mode"
-import { AdvanceOllamaSettings } from "@/components/Common/AdvanceOllamaSettings"
+import { AdvanceOllamaSettings } from "@/components/Common/Settings/AdvanceOllamaSettings"
 
 export const SettingsBody = () => {
   const { t } = useTranslation("settings")