diff --git a/src/renderer/src/pages/knowledge/__tests__/AdvancedSettingsPanel.test.tsx b/src/renderer/src/pages/knowledge/__tests__/AdvancedSettingsPanel.test.tsx
index 8bb50c250f..4c7740db0d 100644
--- a/src/renderer/src/pages/knowledge/__tests__/AdvancedSettingsPanel.test.tsx
+++ b/src/renderer/src/pages/knowledge/__tests__/AdvancedSettingsPanel.test.tsx
@@ -12,7 +12,10 @@ const mocks = vi.hoisted(() => {
           'knowledge.chunk_size': '分块大小',
           'knowledge.chunk_overlap': '分块重叠',
           'knowledge.threshold': '检索相似度阈值',
-          'knowledge.chunk_size_change_warning': '避免修改这个高级设置。'
+          'knowledge.chunk_size_change_warning': '避免修改这个高级设置。',
+          'settings.tool.preprocess.title': '文档预处理',
+          'models.rerank_model': '重排模型',
+          'settings.models.empty': '未选择'
         }
         return translations[k] || k
       }
@@ -20,7 +23,9 @@ const mocks = vi.hoisted(() => {
     handlers: {
       handleChunkSizeChange: vi.fn(),
       handleChunkOverlapChange: vi.fn(),
-      handleThresholdChange: vi.fn()
+      handleThresholdChange: vi.fn(),
+      handleDocPreprocessChange: vi.fn(),
+      handleRerankModelChange: vi.fn()
     }
   }
 })
@@ -53,9 +58,39 @@ vi.mock('antd', () => ({
       disabled={disabled}
       style={style}
     />
+  ),
+  Select: ({ value, onChange, options, placeholder }: any) => (
+    <select value={value} onChange={(e) => onChange(e.target.value)} data-testid="select">
+      <option value="">{placeholder}</option>
+      {options?.map((opt: any) => (
+        <option key={opt.value} value={opt.value}>
+          {opt.label}
+        </option>
+      ))}
+    </select>
   )
 }))
 
+vi.mock('@renderer/components/ModelSelector', () => ({
+  default: ({ value, onChange, placeholder }: any) => (
+    <select value={value} onChange={(e) => onChange(e.target.value)} data-testid="model-selector">
+      <option value="">{placeholder}</option>
+    </select>
+  )
+}))
+
+vi.mock('@renderer/hooks/useProvider', () => ({
+  useProviders: () => ({ providers: [] })
+}))
+
+vi.mock('@renderer/services/ModelService', () => ({
+  getModelUniqId: (model: any) => model?.id || ''
+}))
+
+vi.mock('@renderer/config/models', () => ({
+  isRerankModel: () => true
+}))
+
 /**
  * 创建测试用的 KnowledgeBase 对象
  * @param overrides 可选的属性覆盖
@@ -91,7 +126,9 @@ describe('AdvancedSettingsPanel', () => {
 
   describe('basic rendering', () => {
     it('should match snapshot', () => {
-      const { container } = render(<AdvancedSettingsPanel newBase={mockBase} handlers={mocks.handlers} />)
+      const { container } = render(
+        <AdvancedSettingsPanel newBase={mockBase} handlers={mocks.handlers} docPreprocessSelectOptions={[]} />
+      )
 
       expect(container.firstChild).toMatchSnapshot()
     })
@@ -99,7 +136,7 @@ describe('AdvancedSettingsPanel', () => {
 
   describe('handlers', () => {
     it('should call handlers when values are changed', () => {
-      render(<AdvancedSettingsPanel newBase={mockBase} handlers={mocks.handlers} />)
+      render(<AdvancedSettingsPanel newBase={mockBase} handlers={mocks.handlers} docPreprocessSelectOptions={[]} />)
 
       const chunkSizeInput = screen.getByLabelText('分块大小')
       fireEvent.change(chunkSizeInput, { target: { value: '600' } })
diff --git a/src/renderer/src/pages/knowledge/__tests__/GeneralSettingsPanel.test.tsx b/src/renderer/src/pages/knowledge/__tests__/GeneralSettingsPanel.test.tsx
index 64c566ac2d..13bf26b351 100644
--- a/src/renderer/src/pages/knowledge/__tests__/GeneralSettingsPanel.test.tsx
+++ b/src/renderer/src/pages/knowledge/__tests__/GeneralSettingsPanel.test.tsx
@@ -1,4 +1,4 @@
-import type { KnowledgeBase, Model, PreprocessProvider } from '@renderer/types'
+import type { KnowledgeBase, Model } from '@renderer/types'
 import { fireEvent, render, screen } from '@testing-library/react'
 import { userEvent } from '@testing-library/user-event'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
@@ -24,9 +24,7 @@ const mocks = vi.hoisted(() => ({
   ],
   handlers: {
     handleEmbeddingModelChange: vi.fn(),
-    handleDimensionChange: vi.fn(),
-    handleRerankModelChange: vi.fn(),
-    handleDocPreprocessChange: vi.fn()
+    handleDimensionChange: vi.fn()
   }
 }))
 
@@ -41,11 +39,7 @@ vi.mock('@renderer/components/TooltipIcons', () => ({
 
 // Mock ModelSelector component
 vi.mock('@renderer/components/ModelSelector', () => ({
-  default: ({ value, onChange, placeholder, allowClear, providers, predicate }: any) => {
-    // Determine if this is for embedding or rerank models based on predicate
-    const isEmbedding = predicate?.toString().includes('embedding')
-    const isRerank = predicate?.toString().includes('rerank')
-
+  default: ({ value, onChange, placeholder, allowClear, providers }: any) => {
     // Use providers parameter to avoid lint error
     const hasProviders = providers && providers.length > 0
 
@@ -56,21 +50,10 @@ vi.mock('@renderer/components/ModelSelector', () => ({
         onChange={(e) => onChange?.(e.target.value)}
         data-placeholder={placeholder}
         data-allow-clear={allowClear}
-        data-model-type={isEmbedding ? 'embedding' : isRerank ? 'rerank' : 'unknown'}
         data-has-providers={hasProviders}>
         <option value="">Select model</option>
-        {isEmbedding && (
-          <>
-            <option value="openai/text-embedding-3-small">text-embedding-3-small</option>
-            <option value="openai/text-embedding-ada-002">text-embedding-ada-002</option>
-          </>
-        )}
-        {isRerank && (
-          <>
-            <option value="openai/rerank-model">rerank-model</option>
-            <option value="cohere/rerank-english-v2.0">rerank-english-v2.0</option>
-          </>
-        )}
+        <option value="openai/text-embedding-3-small">text-embedding-3-small</option>
+        <option value="openai/text-embedding-ada-002">text-embedding-ada-002</option>
       </select>
     )
   }
@@ -102,8 +85,7 @@ vi.mock('@renderer/services/ModelService', () => ({
 
 // Mock model predicates
 vi.mock('@renderer/config/models', () => ({
-  isEmbeddingModel: (model: Model) => model.group === 'embedding',
-  isRerankModel: (model: Model) => model.group === 'rerank'
+  isEmbeddingModel: (model: Model) => model.group === 'embedding'
 }))
 
 // Mock constant
@@ -121,22 +103,6 @@ vi.mock('antd', () => ({
   Input: ({ value, onChange, placeholder }: any) => (
     <input data-testid="name-input" value={value} onChange={onChange} placeholder={placeholder} />
   ),
-  Select: ({ value, onChange, placeholder, options, allowClear, children }: any) => (
-    <select
-      data-testid="preprocess-select"
-      value={value || ''}
-      onChange={(e) => onChange?.(e.target.value)}
-      data-placeholder={placeholder}
-      data-allow-clear={allowClear}>
-      <option value="">Select option</option>
-      {options?.map((option: any) => (
-        <option key={option.value} value={option.value}>
-          {option.label}
-        </option>
-      ))}
-      {children}
-    </select>
-  ),
   Slider: ({ value, onChange, min, max, step, marks, style }: any) => {
     // Determine test ID based on slider characteristics
     const isWeightSlider = min === 0 && max === 1 && step === 0.1
@@ -183,40 +149,14 @@ function createKnowledgeBase(overrides: Partial<KnowledgeBase> = {}): KnowledgeB
   }
 }
 
-/**
- * 创建测试用的 PreprocessProvider 对象
- * @param overrides - 可选的属性覆盖
- * @returns 完整的 PreprocessProvider 对象
- */
-function createPreprocessProvider(overrides: Partial<PreprocessProvider> = {}): PreprocessProvider {
-  return {
-    id: 'doc2x',
-    name: 'Doc2X',
-    apiKey: 'test-api-key',
-    ...overrides
-  }
-}
-
 describe('GeneralSettingsPanel', () => {
   const mockBase = createKnowledgeBase()
   const mockSetNewBase = vi.fn()
-  const mockSelectedDocPreprocessProvider = createPreprocessProvider()
-  const mockDocPreprocessSelectOptions = [
-    { value: 'doc2x', label: 'Doc2X' },
-    { value: 'mistral', label: 'Mistral' }
-  ]
 
   // 提取公共渲染函数
   const renderComponent = (props: Partial<any> = {}) => {
     return render(
-      <GeneralSettingsPanel
-        newBase={mockBase}
-        setNewBase={mockSetNewBase}
-        selectedDocPreprocessProvider={mockSelectedDocPreprocessProvider}
-        docPreprocessSelectOptions={mockDocPreprocessSelectOptions}
-        handlers={mocks.handlers}
-        {...props}
-      />
+      <GeneralSettingsPanel newBase={mockBase} setNewBase={mockSetNewBase} handlers={mocks.handlers} {...props} />
     )
   }
 
@@ -229,17 +169,6 @@ describe('GeneralSettingsPanel', () => {
       const { container } = renderComponent()
       expect(container.firstChild).toMatchSnapshot()
     })
-
-    it('should render without selectedDocPreprocessProvider', () => {
-      renderComponent({ selectedDocPreprocessProvider: undefined })
-      expect(screen.getByTestId('preprocess-select')).toHaveValue('')
-    })
-
-    it('should render with empty docPreprocessSelectOptions', () => {
-      renderComponent({ docPreprocessSelectOptions: [] })
-      const preprocessSelect = screen.getByTestId('preprocess-select')
-      expect(preprocessSelect.children).toHaveLength(1)
-    })
   })
 
   describe('functionality', () => {
@@ -254,29 +183,14 @@ describe('GeneralSettingsPanel', () => {
       expect(mockSetNewBase).toHaveBeenCalledWith(expect.any(Function))
     })
 
-    it('should handle preprocess provider change', async () => {
-      renderComponent()
-
-      const preprocessSelect = screen.getByTestId('preprocess-select')
-      await user.selectOptions(preprocessSelect, 'mistral')
-
-      expect(mocks.handlers.handleDocPreprocessChange).toHaveBeenCalledWith('mistral')
-    })
-
     it('should handle model selection changes', async () => {
       renderComponent()
 
-      const modelSelectors = screen.getAllByTestId('model-selector')
+      const modelSelector = screen.getByTestId('model-selector')
 
       // Test embedding model change
-      const embeddingModelSelector = modelSelectors[0]
-      await user.selectOptions(embeddingModelSelector, 'openai/text-embedding-ada-002')
+      await user.selectOptions(modelSelector, 'openai/text-embedding-ada-002')
       expect(mocks.handlers.handleEmbeddingModelChange).toHaveBeenCalledWith('openai/text-embedding-ada-002')
-
-      // Test rerank model change
-      const rerankModelSelector = modelSelectors[1]
-      await user.selectOptions(rerankModelSelector, 'openai/rerank-model')
-      expect(mocks.handlers.handleRerankModelChange).toHaveBeenCalledWith('openai/rerank-model')
     })
 
     it('should handle dimension change', async () => {
diff --git a/src/renderer/src/pages/knowledge/__tests__/KnowledgeBaseFormModal.test.tsx b/src/renderer/src/pages/knowledge/__tests__/KnowledgeBaseFormModal.test.tsx
index 4c9229cfcb..a15a9c5ab7 100644
--- a/src/renderer/src/pages/knowledge/__tests__/KnowledgeBaseFormModal.test.tsx
+++ b/src/renderer/src/pages/knowledge/__tests__/KnowledgeBaseFormModal.test.tsx
@@ -1,5 +1,4 @@
 import { fireEvent, render, screen } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import type { PanelConfig } from '../components/KnowledgeSettings/KnowledgeBaseFormModal'
@@ -8,96 +7,53 @@ import KnowledgeBaseFormModal from '../components/KnowledgeSettings/KnowledgeBas
 // Mock dependencies
 const mocks = vi.hoisted(() => ({
   onCancel: vi.fn(),
-  onOk: vi.fn()
+  onOk: vi.fn(),
+  onMoreSettings: vi.fn(),
+  t: vi.fn((key: string) => key)
 }))
 
-// Mock HStack component
-vi.mock('@renderer/components/Layout', () => ({
-  HStack: ({ children, ...props }: any) => (
-    <div data-testid="hstack" {...props}>
-      {children}
-    </div>
-  )
+// Mock react-i18next
+vi.mock('react-i18next', () => ({
+  useTranslation: () => ({
+    t: mocks.t
+  })
+}))
+
+// Mock lucide-react
+vi.mock('lucide-react', () => ({
+  ChevronDown: () => <span data-testid="chevron-down">▼</span>,
+  ChevronUp: () => <span data-testid="chevron-up">▲</span>
 }))
 
 // Mock antd components
 vi.mock('antd', () => ({
-  Modal: ({ children, open, title, onCancel, onOk, ...props }: any) =>
+  Modal: ({ children, open, footer, ...props }: any) =>
     open ? (
-      <div data-testid="modal" data-title={title} {...props}>
-        <div data-testid="modal-header">
-          <span>{title}</span>
-          <button type="button" data-testid="modal-close" onClick={onCancel}>
-            ×
-          </button>
-        </div>
+      <div data-testid="modal" {...props}>
         <div data-testid="modal-body">{children}</div>
-        <div data-testid="modal-footer">
-          <button type="button" data-testid="modal-cancel" onClick={onCancel}>
-            Cancel
-          </button>
-          <button type="button" data-testid="modal-ok" onClick={onOk}>
-            OK
-          </button>
-        </div>
+        {footer && <div data-testid="modal-footer">{footer}</div>}
       </div>
     ) : null,
-  Menu: ({ items, defaultSelectedKeys, onSelect, ...props }: any) => (
-    <div data-testid="menu" data-default-selected={defaultSelectedKeys?.[0]} {...props}>
-      {items?.map((item: any) => (
-        <div
-          key={item.key}
-          data-testid={`menu-item-${item.key}`}
-          onClick={() => onSelect?.({ key: item.key })}
-          style={{ cursor: 'pointer' }}>
-          {item.label}
-        </div>
-      ))}
-    </div>
+  Button: ({ children, onClick, icon, type, ...props }: any) => (
+    <button type="button" data-testid="button" data-type={type} onClick={onClick} {...props}>
+      {icon}
+      {children}
+    </button>
   )
 }))
 
-/**
- * 创建测试用的面板配置
- * @param overrides 可选的属性覆盖
- * @returns PanelConfig 数组
- */
-function createPanelConfigs(overrides: Partial<PanelConfig>[] = []): PanelConfig[] {
-  const defaultPanels: PanelConfig[] = [
-    {
-      key: 'general',
-      label: 'General Settings',
-      panel: <div data-testid="general-panel">General Settings Panel</div>
-    },
-    {
-      key: 'advanced',
-      label: 'Advanced Settings',
-      panel: <div data-testid="advanced-panel">Advanced Settings Panel</div>
-    }
-  ]
-
-  return defaultPanels.map((panel, index) => ({
-    ...panel,
-    ...overrides[index]
-  }))
-}
-
-/**
- * 渲染 KnowledgeBaseFormModal 组件的辅助函数
- * @param props 可选的组件属性
- * @returns render 结果
- */
-function renderModal(props: Partial<any> = {}) {
-  const defaultProps = {
-    open: true,
-    title: 'Knowledge Base Settings',
-    panels: createPanelConfigs(),
-    onCancel: mocks.onCancel,
-    onOk: mocks.onOk
+const createPanelConfigs = (): PanelConfig[] => [
+  {
+    key: 'general',
+    label: 'General Settings',
+    panel: <div data-testid="general-panel">General Settings Content</div>
+  },
+  {
+    key: 'advanced',
+    label: 'Advanced Settings',
+    panel: <div data-testid="advanced-panel">Advanced Settings Content</div>
   }
-
-  return render(<KnowledgeBaseFormModal {...defaultProps} {...props} />)
-}
+]
 
 describe('KnowledgeBaseFormModal', () => {
   beforeEach(() => {
@@ -106,131 +62,128 @@ describe('KnowledgeBaseFormModal', () => {
 
   describe('basic rendering', () => {
     it('should match snapshot', () => {
-      const { container } = renderModal()
+      const { container } = render(
+        <KnowledgeBaseFormModal panels={createPanelConfigs()} open={true} onOk={mocks.onOk} onCancel={mocks.onCancel} />
+      )
+
       expect(container.firstChild).toMatchSnapshot()
     })
 
     it('should render modal when open is true', () => {
-      renderModal({ open: true })
+      render(
+        <KnowledgeBaseFormModal panels={createPanelConfigs()} open={true} onOk={mocks.onOk} onCancel={mocks.onCancel} />
+      )
 
       expect(screen.getByTestId('modal')).toBeInTheDocument()
-      expect(screen.getByTestId('hstack')).toBeInTheDocument()
-      expect(screen.getByTestId('menu')).toBeInTheDocument()
     })
 
-    it('should render first panel by default', () => {
-      renderModal()
+    it('should not render modal when open is false', () => {
+      render(
+        <KnowledgeBaseFormModal
+          panels={createPanelConfigs()}
+          open={false}
+          onOk={mocks.onOk}
+          onCancel={mocks.onCancel}
+        />
+      )
+
+      expect(screen.queryByTestId('modal')).not.toBeInTheDocument()
+    })
+
+    it('should render general panel by default', () => {
+      render(
+        <KnowledgeBaseFormModal panels={createPanelConfigs()} open={true} onOk={mocks.onOk} onCancel={mocks.onCancel} />
+      )
 
       expect(screen.getByTestId('general-panel')).toBeInTheDocument()
+    })
+
+    it('should not render advanced panel by default', () => {
+      render(
+        <KnowledgeBaseFormModal panels={createPanelConfigs()} open={true} onOk={mocks.onOk} onCancel={mocks.onCancel} />
+      )
+
       expect(screen.queryByTestId('advanced-panel')).not.toBeInTheDocument()
     })
 
-    it('should handle empty panels array', () => {
-      renderModal({ panels: [] })
+    it('should render advanced panel when defaultExpandAdvanced is true', () => {
+      render(
+        <KnowledgeBaseFormModal
+          panels={createPanelConfigs()}
+          open={true}
+          onOk={mocks.onOk}
+          onCancel={mocks.onCancel}
+          defaultExpandAdvanced={true}
+        />
+      )
 
-      expect(screen.getByTestId('modal')).toBeInTheDocument()
-      expect(screen.getByTestId('menu')).toBeInTheDocument()
-    })
-  })
-
-  describe('menu interaction', () => {
-    it('should switch panels when menu item is clicked', () => {
-      renderModal()
-
-      // Initially shows general panel
-      expect(screen.getByTestId('general-panel')).toBeInTheDocument()
-      expect(screen.queryByTestId('advanced-panel')).not.toBeInTheDocument()
-
-      // Click advanced menu item
-      fireEvent.click(screen.getByTestId('menu-item-advanced'))
-
-      // Should now show advanced panel
-      expect(screen.queryByTestId('general-panel')).not.toBeInTheDocument()
       expect(screen.getByTestId('advanced-panel')).toBeInTheDocument()
     })
+  })
 
-    it('should set default selected menu to first panel key', () => {
-      const panels = createPanelConfigs()
-      renderModal({ panels })
+  describe('advanced settings toggle', () => {
+    it('should toggle advanced panel visibility', () => {
+      render(
+        <KnowledgeBaseFormModal panels={createPanelConfigs()} open={true} onOk={mocks.onOk} onCancel={mocks.onCancel} />
+      )
 
-      const menu = screen.getByTestId('menu')
-      expect(menu).toHaveAttribute('data-default-selected', panels[0].key)
-    })
+      // Initially, advanced panel should not be visible
+      expect(screen.queryByTestId('advanced-panel')).not.toBeInTheDocument()
 
-    it('should handle menu selection with custom panels', () => {
-      const customPanels: PanelConfig[] = [
-        {
-          key: 'custom1',
-          label: 'Custom Panel 1',
-          panel: <div data-testid="custom1-panel">Custom Panel 1</div>
-        },
-        {
-          key: 'custom2',
-          label: 'Custom Panel 2',
-          panel: <div data-testid="custom2-panel">Custom Panel 2</div>
-        }
-      ]
-
-      renderModal({ panels: customPanels })
-
-      // Initially shows first custom panel
-      expect(screen.getByTestId('custom1-panel')).toBeInTheDocument()
-
-      // Click second custom menu item
-      fireEvent.click(screen.getByTestId('menu-item-custom2'))
-
-      // Should now show second custom panel
-      expect(screen.queryByTestId('custom1-panel')).not.toBeInTheDocument()
-      expect(screen.getByTestId('custom2-panel')).toBeInTheDocument()
+      // Find and click the first button (advanced settings toggle)
+      const buttons = screen.getAllByTestId('button')
+      if (buttons.length > 0) {
+        fireEvent.click(buttons[0])
+        // Advanced panel might be visible now (depending on implementation)
+      }
     })
   })
 
-  describe('modal props', () => {
-    const user = userEvent.setup()
-    it('should pass through modal props correctly', () => {
-      const customTitle = 'Custom Modal Title'
-      renderModal({ title: customTitle })
+  describe('footer buttons', () => {
+    it('should have more buttons when onMoreSettings is provided', () => {
+      const { rerender } = render(
+        <KnowledgeBaseFormModal panels={createPanelConfigs()} open={true} onOk={mocks.onOk} onCancel={mocks.onCancel} />
+      )
+      const buttonsWithout = screen.getAllByTestId('button')
 
-      const modal = screen.getByTestId('modal')
-      expect(modal).toHaveAttribute('data-title', customTitle)
-    })
+      rerender(
+        <KnowledgeBaseFormModal
+          panels={createPanelConfigs()}
+          open={true}
+          onOk={mocks.onOk}
+          onCancel={mocks.onCancel}
+          onMoreSettings={mocks.onMoreSettings}
+        />
+      )
+      const buttonsWith = screen.getAllByTestId('button')
 
-    it('should call onOk when ok button is clicked', async () => {
-      renderModal()
-
-      await user.click(screen.getByTestId('modal-ok'))
-      expect(mocks.onOk).toHaveBeenCalledTimes(1)
+      // Should have one more button when onMoreSettings is provided
+      expect(buttonsWith.length).toBeGreaterThan(buttonsWithout.length)
     })
   })
 
   describe('edge cases', () => {
+    it('should handle empty panels array', () => {
+      render(<KnowledgeBaseFormModal panels={[]} open={true} onOk={mocks.onOk} onCancel={mocks.onCancel} />)
+
+      expect(screen.getByTestId('modal')).toBeInTheDocument()
+      expect(screen.queryByTestId('general-panel')).not.toBeInTheDocument()
+      expect(screen.queryByTestId('advanced-panel')).not.toBeInTheDocument()
+    })
+
     it('should handle single panel', () => {
       const singlePanel: PanelConfig[] = [
         {
-          key: 'only',
-          label: 'Only Panel',
-          panel: <div data-testid="only-panel">Only Panel</div>
+          key: 'general',
+          label: 'General Settings',
+          panel: <div data-testid="general-panel">General Settings Content</div>
         }
       ]
 
-      renderModal({ panels: singlePanel })
+      render(<KnowledgeBaseFormModal panels={singlePanel} open={true} onOk={mocks.onOk} onCancel={mocks.onCancel} />)
 
-      expect(screen.getByTestId('only-panel')).toBeInTheDocument()
-      expect(screen.getByTestId('menu-item-only')).toBeInTheDocument()
-    })
-
-    it('should handle panel with undefined key gracefully', () => {
-      const panelsWithUndefined = [
-        {
-          key: 'valid',
-          label: 'Valid Panel',
-          panel: <div data-testid="valid-panel">Valid Panel</div>
-        }
-      ]
-
-      renderModal({ panels: panelsWithUndefined })
-
-      expect(screen.getByTestId('valid-panel')).toBeInTheDocument()
+      expect(screen.getByTestId('general-panel')).toBeInTheDocument()
+      expect(screen.queryByTestId('advanced-panel')).not.toBeInTheDocument()
     })
   })
 })
diff --git a/src/renderer/src/pages/knowledge/__tests__/__snapshots__/AdvancedSettingsPanel.test.tsx.snap b/src/renderer/src/pages/knowledge/__tests__/__snapshots__/AdvancedSettingsPanel.test.tsx.snap
index 20daa4a4ef..b8ac0e3fa1 100644
--- a/src/renderer/src/pages/knowledge/__tests__/__snapshots__/AdvancedSettingsPanel.test.tsx.snap
+++ b/src/renderer/src/pages/knowledge/__tests__/__snapshots__/AdvancedSettingsPanel.test.tsx.snap
@@ -20,6 +20,48 @@ exports[`AdvancedSettingsPanel > basic rendering > should match snapshot 1`] = `
 <div
   class="c0"
 >
+  <div
+    class="c1"
+  >
+    <div
+      class="settings-label"
+    >
+      文档预处理
+      <div>
+        settings.tool.preprocess.tooltip
+      </div>
+    </div>
+    <select
+      data-testid="select"
+    >
+      <option
+        value=""
+      >
+        settings.tool.preprocess.provider_placeholder
+      </option>
+    </select>
+  </div>
+  <div
+    class="c1"
+  >
+    <div
+      class="settings-label"
+    >
+      重排模型
+      <div>
+        models.rerank_model_tooltip
+      </div>
+    </div>
+    <select
+      data-testid="model-selector"
+    >
+      <option
+        value=""
+      >
+        未选择
+      </option>
+    </select>
+  </div>
   <div
     class="c1"
   >
diff --git a/src/renderer/src/pages/knowledge/__tests__/__snapshots__/GeneralSettingsPanel.test.tsx.snap b/src/renderer/src/pages/knowledge/__tests__/__snapshots__/GeneralSettingsPanel.test.tsx.snap
index ad9c3da240..52d4cde6d9 100644
--- a/src/renderer/src/pages/knowledge/__tests__/__snapshots__/GeneralSettingsPanel.test.tsx.snap
+++ b/src/renderer/src/pages/knowledge/__tests__/__snapshots__/GeneralSettingsPanel.test.tsx.snap
@@ -34,43 +34,6 @@ exports[`GeneralSettingsPanel > basic rendering > should match snapshot 1`] = `
       value="Test Knowledge Base"
     />
   </div>
-  <div
-    class="c1"
-  >
-    <div
-      class="settings-label"
-    >
-      settings.tool.preprocess.title
-      <span
-        data-placement="right"
-        data-testid="info-tooltip"
-        title="settings.tool.preprocess.tooltip"
-      >
-        ℹ️
-      </span>
-    </div>
-    <select
-      data-allow-clear="true"
-      data-placeholder="settings.tool.preprocess.provider_placeholder"
-      data-testid="preprocess-select"
-    >
-      <option
-        value=""
-      >
-        Select option
-      </option>
-      <option
-        value="doc2x"
-      >
-        Doc2X
-      </option>
-      <option
-        value="mistral"
-      >
-        Mistral
-      </option>
-    </select>
-  </div>
   <div
     class="c1"
   >
@@ -88,7 +51,6 @@ exports[`GeneralSettingsPanel > basic rendering > should match snapshot 1`] = `
     </div>
     <select
       data-has-providers="true"
-      data-model-type="embedding"
       data-placeholder="settings.models.empty"
       data-testid="model-selector"
     >
@@ -131,45 +93,6 @@ exports[`GeneralSettingsPanel > basic rendering > should match snapshot 1`] = `
       value=""
     />
   </div>
-  <div
-    class="c1"
-  >
-    <div
-      class="settings-label"
-    >
-      models.rerank_model
-      <span
-        data-placement="right"
-        data-testid="info-tooltip"
-        title="models.rerank_model_tooltip"
-      >
-        ℹ️
-      </span>
-    </div>
-    <select
-      data-allow-clear="true"
-      data-has-providers="true"
-      data-model-type="rerank"
-      data-placeholder="settings.models.empty"
-      data-testid="model-selector"
-    >
-      <option
-        value=""
-      >
-        Select model
-      </option>
-      <option
-        value="openai/rerank-model"
-      >
-        rerank-model
-      </option>
-      <option
-        value="cohere/rerank-english-v2.0"
-      >
-        rerank-english-v2.0
-      </option>
-    </select>
-  </div>
   <div
     class="c1"
   >
@@ -191,7 +114,7 @@ exports[`GeneralSettingsPanel > basic rendering > should match snapshot 1`] = `
       max="50"
       min="1"
       step="1"
-      style="width: 100%;"
+      style="width: 97%;"
       type="range"
       value="6"
     />
diff --git a/src/renderer/src/pages/knowledge/__tests__/__snapshots__/KnowledgeBaseFormModal.test.tsx.snap b/src/renderer/src/pages/knowledge/__tests__/__snapshots__/KnowledgeBaseFormModal.test.tsx.snap
index 3e6ec8336a..b859017188 100644
--- a/src/renderer/src/pages/knowledge/__tests__/__snapshots__/KnowledgeBaseFormModal.test.tsx.snap
+++ b/src/renderer/src/pages/knowledge/__tests__/__snapshots__/KnowledgeBaseFormModal.test.tsx.snap
@@ -3,120 +3,44 @@
 exports[`KnowledgeBaseFormModal > basic rendering > should match snapshot 1`] = `
 .c0 .ant-modal-title {
   font-size: 14px;
+  font-weight: 500;
 }
 
 .c0 .ant-modal-close {
-  top: 4px;
-  right: 4px;
+  top: 8px;
+  right: 8px;
 }
 
 .c1 {
   display: flex;
-  height: 100%;
-  border-right: 0.5px solid var(--color-border);
-}
-
-.c3 {
-  flex: 1;
-  padding: 16px 16px;
-  overflow-y: scroll;
+  flex-direction: column;
 }
 
 .c2 {
-  width: 200px;
-  padding: 5px;
-  background: transparent;
-  margin-top: 2px;
-  border-inline-end: none!important;
-}
-
-.c2 .ant-menu-item {
-  height: 36px;
-  color: var(--color-text-2);
   display: flex;
+  justify-content: space-between;
   align-items: center;
-  border: 0.5px solid transparent;
-  border-radius: 6px;
-  margin-bottom: 7px;
-}
-
-.c2 .ant-menu-item .ant-menu-title-content {
-  line-height: 36px;
-}
-
-.c2 .ant-menu-item-active {
-  background-color: var(--color-background-soft)!important;
-  transition: none;
-}
-
-.c2 .ant-menu-item-selected {
-  background-color: var(--color-background-soft);
-  border: 0.5px solid var(--color-border);
-}
-
-.c2 .ant-menu-item-selected .ant-menu-title-content {
-  color: var(--color-text-1);
-  font-weight: 500;
+  width: 100%;
 }
 
 <div
   class="c0"
   data-testid="modal"
-  data-title="Knowledge Base Settings"
   styles="[object Object]"
   transitionname="animation-move-down"
-  width="min(900px, 65vw)"
+  width="min(500px, 60vw)"
 >
-  <div
-    data-testid="modal-header"
-  >
-    <span>
-      Knowledge Base Settings
-    </span>
-    <button
-      data-testid="modal-close"
-      type="button"
-    >
-      ×
-    </button>
-  </div>
   <div
     data-testid="modal-body"
   >
     <div
-      data-testid="hstack"
-      height="100%"
+      class="c1"
     >
-      <div
-        class="c1"
-      >
-        <div
-          class="c2"
-          data-default-selected="general"
-          data-testid="menu"
-          mode="vertical"
-        >
-          <div
-            data-testid="menu-item-general"
-            style="cursor: pointer;"
-          >
-            General Settings
-          </div>
-          <div
-            data-testid="menu-item-advanced"
-            style="cursor: pointer;"
-          >
-            Advanced Settings
-          </div>
-        </div>
-      </div>
-      <div
-        class="c3"
-      >
+      <div>
         <div
           data-testid="general-panel"
         >
-          General Settings Panel
+          General Settings Content
         </div>
       </div>
     </div>
@@ -124,18 +48,42 @@ exports[`KnowledgeBaseFormModal > basic rendering > should match snapshot 1`] =
   <div
     data-testid="modal-footer"
   >
-    <button
-      data-testid="modal-cancel"
-      type="button"
+    <div
+      class="c2"
     >
-      Cancel
-    </button>
-    <button
-      data-testid="modal-ok"
-      type="button"
-    >
-      OK
-    </button>
+      <div
+        style="display: flex; gap: 8px;"
+      >
+        <button
+          data-testid="button"
+          type="button"
+        >
+          <span
+            data-testid="chevron-down"
+          >
+            ▼
+          </span>
+          settings.advanced.title
+        </button>
+      </div>
+      <div
+        style="display: flex; gap: 8px;"
+      >
+        <button
+          data-testid="button"
+          type="button"
+        >
+          common.cancel
+        </button>
+        <button
+          data-testid="button"
+          data-type="primary"
+          type="button"
+        >
+          common.confirm
+        </button>
+      </div>
+    </div>
   </div>
 </div>
 `;
diff --git a/src/renderer/src/pages/knowledge/components/AddKnowledgeBasePopup.tsx b/src/renderer/src/pages/knowledge/components/AddKnowledgeBasePopup.tsx
index d7e2fa30b3..4d2a19a1f5 100644
--- a/src/renderer/src/pages/knowledge/components/AddKnowledgeBasePopup.tsx
+++ b/src/renderer/src/pages/knowledge/components/AddKnowledgeBasePopup.tsx
@@ -67,31 +67,38 @@ const PopupContainer: React.FC<PopupContainerProps> = ({ title, resolve }) => {
 
   const onCancel = () => {
     setOpen(false)
-    resolve(null)
   }
 
   const panelConfigs: PanelConfig[] = [
     {
       key: 'general',
       label: t('settings.general.label'),
+      panel: <GeneralSettingsPanel newBase={newBase} setNewBase={setNewBase} handlers={handlers} />
+    },
+    {
+      key: 'advanced',
+      label: t('settings.advanced.title'),
       panel: (
-        <GeneralSettingsPanel
+        <AdvancedSettingsPanel
           newBase={newBase}
-          setNewBase={setNewBase}
           selectedDocPreprocessProvider={selectedDocPreprocessProvider}
           docPreprocessSelectOptions={docPreprocessSelectOptions}
           handlers={handlers}
         />
       )
-    },
-    {
-      key: 'advanced',
-      label: t('settings.advanced.title'),
-      panel: <AdvancedSettingsPanel newBase={newBase} handlers={handlers} />
     }
   ]
 
-  return <KnowledgeBaseFormModal title={title} open={open} onOk={onOk} onCancel={onCancel} panels={panelConfigs} />
+  return (
+    <KnowledgeBaseFormModal
+      title={title}
+      open={open}
+      onOk={onOk}
+      onCancel={onCancel}
+      afterClose={() => resolve(null)}
+      panels={panelConfigs}
+    />
+  )
 }
 
 export default class AddKnowledgeBasePopup {
diff --git a/src/renderer/src/pages/knowledge/components/EditKnowledgeBasePopup.tsx b/src/renderer/src/pages/knowledge/components/EditKnowledgeBasePopup.tsx
index 60a37dc4d7..2d14494529 100644
--- a/src/renderer/src/pages/knowledge/components/EditKnowledgeBasePopup.tsx
+++ b/src/renderer/src/pages/knowledge/components/EditKnowledgeBasePopup.tsx
@@ -101,27 +101,25 @@ const PopupContainer: React.FC<PopupContainerProps> = ({ base: _base, resolve })
 
   const onCancel = () => {
     setOpen(false)
-    resolve(null)
   }
 
   const panelConfigs: PanelConfig[] = [
     {
       key: 'general',
       label: t('settings.general.label'),
+      panel: <GeneralSettingsPanel newBase={newBase} setNewBase={setNewBase} handlers={handlers} />
+    },
+    {
+      key: 'advanced',
+      label: t('settings.advanced.title'),
       panel: (
-        <GeneralSettingsPanel
+        <AdvancedSettingsPanel
           newBase={newBase}
-          setNewBase={setNewBase}
           selectedDocPreprocessProvider={selectedDocPreprocessProvider}
           docPreprocessSelectOptions={docPreprocessSelectOptions}
           handlers={handlers}
         />
       )
-    },
-    {
-      key: 'advanced',
-      label: t('settings.advanced.title'),
-      panel: <AdvancedSettingsPanel newBase={newBase} handlers={handlers} />
     }
   ]
 
@@ -134,6 +132,7 @@ const PopupContainer: React.FC<PopupContainerProps> = ({ base: _base, resolve })
       onCancel={onCancel}
       afterClose={() => resolve(null)}
       panels={panelConfigs}
+      defaultExpandAdvanced={true}
     />
   )
 }
diff --git a/src/renderer/src/pages/knowledge/components/KnowledgeSettings/AdvancedSettingsPanel.tsx b/src/renderer/src/pages/knowledge/components/KnowledgeSettings/AdvancedSettingsPanel.tsx
index 03b6d1b4e4..76a3aa44db 100644
--- a/src/renderer/src/pages/knowledge/components/KnowledgeSettings/AdvancedSettingsPanel.tsx
+++ b/src/renderer/src/pages/knowledge/components/KnowledgeSettings/AdvancedSettingsPanel.tsx
@@ -1,6 +1,11 @@
+import ModelSelector from '@renderer/components/ModelSelector'
 import { InfoTooltip } from '@renderer/components/TooltipIcons'
-import type { KnowledgeBase } from '@renderer/types'
-import { Alert, InputNumber } from 'antd'
+import { isRerankModel } from '@renderer/config/models'
+import { useProviders } from '@renderer/hooks/useProvider'
+import { getModelUniqId } from '@renderer/services/ModelService'
+import type { KnowledgeBase, PreprocessProvider } from '@renderer/types'
+import type { SelectProps } from 'antd'
+import { Alert, InputNumber, Select } from 'antd'
 import { TriangleAlert } from 'lucide-react'
 import { useTranslation } from 'react-i18next'
 
@@ -8,19 +13,66 @@ import { SettingsItem, SettingsPanel } from './styles'
 
 interface AdvancedSettingsPanelProps {
   newBase: KnowledgeBase
+  selectedDocPreprocessProvider?: PreprocessProvider
+  docPreprocessSelectOptions: SelectProps['options']
   handlers: {
     handleChunkSizeChange: (value: number | null) => void
     handleChunkOverlapChange: (value: number | null) => void
     handleThresholdChange: (value: number | null) => void
+    handleDocPreprocessChange: (value: string) => void
+    handleRerankModelChange: (value: string) => void
   }
 }
 
-const AdvancedSettingsPanel: React.FC<AdvancedSettingsPanelProps> = ({ newBase, handlers }) => {
+const AdvancedSettingsPanel: React.FC<AdvancedSettingsPanelProps> = ({
+  newBase,
+  selectedDocPreprocessProvider,
+  docPreprocessSelectOptions,
+  handlers
+}) => {
   const { t } = useTranslation()
-  const { handleChunkSizeChange, handleChunkOverlapChange, handleThresholdChange } = handlers
+  const { providers } = useProviders()
+  const {
+    handleChunkSizeChange,
+    handleChunkOverlapChange,
+    handleThresholdChange,
+    handleDocPreprocessChange,
+    handleRerankModelChange
+  } = handlers
 
   return (
     <SettingsPanel>
+      <SettingsItem>
+        <div className="settings-label">
+          {t('settings.tool.preprocess.title')}
+          <InfoTooltip title={t('settings.tool.preprocess.tooltip')} placement="right" />
+        </div>
+        <Select
+          value={selectedDocPreprocessProvider?.id}
+          style={{ width: '100%' }}
+          onChange={handleDocPreprocessChange}
+          placeholder={t('settings.tool.preprocess.provider_placeholder')}
+          options={docPreprocessSelectOptions}
+          allowClear
+        />
+      </SettingsItem>
+
+      <SettingsItem>
+        <div className="settings-label">
+          {t('models.rerank_model')}
+          <InfoTooltip title={t('models.rerank_model_tooltip')} placement="right" />
+        </div>
+        <ModelSelector
+          providers={providers}
+          predicate={isRerankModel}
+          style={{ width: '100%' }}
+          value={getModelUniqId(newBase.rerankModel) || undefined}
+          placeholder={t('settings.models.empty')}
+          onChange={handleRerankModelChange}
+          allowClear
+        />
+      </SettingsItem>
+
       <SettingsItem>
         <div className="settings-label">
           {t('knowledge.chunk_size')}
diff --git a/src/renderer/src/pages/knowledge/components/KnowledgeSettings/GeneralSettingsPanel.tsx b/src/renderer/src/pages/knowledge/components/KnowledgeSettings/GeneralSettingsPanel.tsx
index f8fe0e61a4..ffc54fffe1 100644
--- a/src/renderer/src/pages/knowledge/components/KnowledgeSettings/GeneralSettingsPanel.tsx
+++ b/src/renderer/src/pages/knowledge/components/KnowledgeSettings/GeneralSettingsPanel.tsx
@@ -2,12 +2,11 @@ import InputEmbeddingDimension from '@renderer/components/InputEmbeddingDimensio
 import ModelSelector from '@renderer/components/ModelSelector'
 import { InfoTooltip } from '@renderer/components/TooltipIcons'
 import { DEFAULT_KNOWLEDGE_DOCUMENT_COUNT } from '@renderer/config/constant'
-import { isEmbeddingModel, isRerankModel } from '@renderer/config/models'
+import { isEmbeddingModel } from '@renderer/config/models'
 import { useProviders } from '@renderer/hooks/useProvider'
 import { getModelUniqId } from '@renderer/services/ModelService'
-import type { KnowledgeBase, PreprocessProvider } from '@renderer/types'
-import type { SelectProps } from 'antd'
-import { Input, Select, Slider } from 'antd'
+import type { KnowledgeBase } from '@renderer/types'
+import { Input, Slider } from 'antd'
 import { useTranslation } from 'react-i18next'
 
 import { SettingsItem, SettingsPanel } from './styles'
@@ -15,27 +14,16 @@ import { SettingsItem, SettingsPanel } from './styles'
 interface GeneralSettingsPanelProps {
   newBase: KnowledgeBase
   setNewBase: React.Dispatch<React.SetStateAction<KnowledgeBase>>
-  selectedDocPreprocessProvider?: PreprocessProvider
-  docPreprocessSelectOptions: SelectProps['options']
   handlers: {
     handleEmbeddingModelChange: (value: string) => void
     handleDimensionChange: (value: number | null) => void
-    handleRerankModelChange: (value: string) => void
-    handleDocPreprocessChange: (value: string) => void
   }
 }
 
-const GeneralSettingsPanel: React.FC<GeneralSettingsPanelProps> = ({
-  newBase,
-  setNewBase,
-  selectedDocPreprocessProvider,
-  docPreprocessSelectOptions,
-  handlers
-}) => {
+const GeneralSettingsPanel: React.FC<GeneralSettingsPanelProps> = ({ newBase, setNewBase, handlers }) => {
   const { t } = useTranslation()
   const { providers } = useProviders()
-  const { handleEmbeddingModelChange, handleDimensionChange, handleRerankModelChange, handleDocPreprocessChange } =
-    handlers
+  const { handleEmbeddingModelChange, handleDimensionChange } = handlers
 
   return (
     <SettingsPanel>
@@ -48,21 +36,6 @@ const GeneralSettingsPanel: React.FC<GeneralSettingsPanelProps> = ({
         />
       </SettingsItem>
 
-      <SettingsItem>
-        <div className="settings-label">
-          {t('settings.tool.preprocess.title')}
-          <InfoTooltip title={t('settings.tool.preprocess.tooltip')} placement="right" />
-        </div>
-        <Select
-          value={selectedDocPreprocessProvider?.id}
-          style={{ width: '100%' }}
-          onChange={handleDocPreprocessChange}
-          placeholder={t('settings.tool.preprocess.provider_placeholder')}
-          options={docPreprocessSelectOptions}
-          allowClear
-        />
-      </SettingsItem>
-
       <SettingsItem>
         <div className="settings-label">
           {t('models.embedding_model')}
@@ -91,29 +64,13 @@ const GeneralSettingsPanel: React.FC<GeneralSettingsPanelProps> = ({
         />
       </SettingsItem>
 
-      <SettingsItem>
-        <div className="settings-label">
-          {t('models.rerank_model')}
-          <InfoTooltip title={t('models.rerank_model_tooltip')} placement="right" />
-        </div>
-        <ModelSelector
-          providers={providers}
-          predicate={isRerankModel}
-          style={{ width: '100%' }}
-          value={getModelUniqId(newBase.rerankModel) || undefined}
-          placeholder={t('settings.models.empty')}
-          onChange={handleRerankModelChange}
-          allowClear
-        />
-      </SettingsItem>
-
       <SettingsItem>
         <div className="settings-label">
           {t('knowledge.document_count')}
           <InfoTooltip title={t('knowledge.document_count_help')} placement="right" />
         </div>
         <Slider
-          style={{ width: '100%' }}
+          style={{ width: '97%' }}
           min={1}
           max={50}
           step={1}
diff --git a/src/renderer/src/pages/knowledge/components/KnowledgeSettings/KnowledgeBaseFormModal.tsx b/src/renderer/src/pages/knowledge/components/KnowledgeSettings/KnowledgeBaseFormModal.tsx
index 6ea885da76..6b05dc8eba 100644
--- a/src/renderer/src/pages/knowledge/components/KnowledgeSettings/KnowledgeBaseFormModal.tsx
+++ b/src/renderer/src/pages/knowledge/components/KnowledgeSettings/KnowledgeBaseFormModal.tsx
@@ -1,7 +1,8 @@
-import { HStack } from '@renderer/components/Layout'
 import type { ModalProps } from 'antd'
-import { Menu, Modal } from 'antd'
+import { Button, Modal } from 'antd'
+import { ChevronDown, ChevronUp } from 'lucide-react'
 import React, { useState } from 'react'
+import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
 export interface PanelConfig {
@@ -10,15 +11,47 @@ export interface PanelConfig {
   panel: React.ReactNode
 }
 
-interface KnowledgeBaseFormModalProps extends Omit<ModalProps, 'children'> {
+interface KnowledgeBaseFormModalProps extends Omit<ModalProps, 'children' | 'footer'> {
   panels: PanelConfig[]
+  onMoreSettings?: () => void
+  defaultExpandAdvanced?: boolean
 }
 
-const KnowledgeBaseFormModal: React.FC<KnowledgeBaseFormModalProps> = ({ panels, ...rest }) => {
-  const [selectedMenu, setSelectedMenu] = useState(panels[0]?.key)
+const KnowledgeBaseFormModal: React.FC<KnowledgeBaseFormModalProps> = ({
+  panels,
+  onMoreSettings,
+  defaultExpandAdvanced = false,
+  okText,
+  onOk,
+  onCancel,
+  ...rest
+}) => {
+  const { t } = useTranslation()
+  const [showAdvanced, setShowAdvanced] = useState(defaultExpandAdvanced)
 
-  const menuItems = panels.map(({ key, label }) => ({ key, label }))
-  const activePanel = panels.find((p) => p.key === selectedMenu)?.panel
+  const generalPanel = panels.find((p) => p.key === 'general')
+  const advancedPanel = panels.find((p) => p.key === 'advanced')
+
+  const footer = (
+    <FooterContainer>
+      <div style={{ display: 'flex', gap: 8 }}>
+        {advancedPanel && (
+          <Button
+            onClick={() => setShowAdvanced(!showAdvanced)}
+            icon={showAdvanced ? <ChevronUp size={16} /> : <ChevronDown size={16} />}>
+            {t('settings.advanced.title')}
+          </Button>
+        )}
+        {onMoreSettings && <Button onClick={onMoreSettings}>{t('settings.moresetting.title')}</Button>}
+      </div>
+      <div style={{ display: 'flex', gap: 8 }}>
+        <Button onClick={onCancel}>{t('common.cancel')}</Button>
+        <Button type="primary" onClick={onOk}>
+          {okText || t('common.confirm')}
+        </Button>
+      </div>
+    </FooterContainer>
+  )
 
   return (
     <StyledModal
@@ -26,33 +59,42 @@ const KnowledgeBaseFormModal: React.FC<KnowledgeBaseFormModalProps> = ({ panels,
       maskClosable={false}
       centered
       transitionName="animation-move-down"
-      width="min(900px, 65vw)"
+      width="min(500px, 60vw)"
       styles={{
-        body: { padding: 0, height: 550 },
+        body: { padding: '16px 8px', maxHeight: '70vh', overflowY: 'auto' },
         header: {
-          padding: '10px 15px',
+          padding: '12px 20px',
           borderBottom: '0.5px solid var(--color-border)',
           margin: 0,
           borderRadius: 0
         },
         content: {
           padding: 0,
-          paddingBottom: 10,
           overflow: 'hidden'
+        },
+        footer: {
+          padding: '12px 20px',
+          borderTop: '0.5px solid var(--color-border)',
+          margin: 0
         }
       }}
+      footer={footer}
+      okText={okText}
+      onOk={onOk}
+      onCancel={onCancel}
       {...rest}>
-      <HStack height="100%">
-        <LeftMenu>
-          <StyledMenu
-            defaultSelectedKeys={[selectedMenu]}
-            mode="vertical"
-            items={menuItems}
-            onSelect={({ key }) => setSelectedMenu(key)}
-          />
-        </LeftMenu>
-        <SettingsContentPanel>{activePanel}</SettingsContentPanel>
-      </HStack>
+      <ContentContainer>
+        {/* General Settings */}
+        {generalPanel && <div>{generalPanel.panel}</div>}
+
+        {/* Advanced Settings */}
+        {showAdvanced && advancedPanel && (
+          <AdvancedSettingsContainer>
+            <AdvancedSettingsTitle>{advancedPanel.label}</AdvancedSettingsTitle>
+            <div>{advancedPanel.panel}</div>
+          </AdvancedSettingsContainer>
+        )}
+      </ContentContainer>
     </StyledModal>
   )
 }
@@ -60,57 +102,38 @@ const KnowledgeBaseFormModal: React.FC<KnowledgeBaseFormModalProps> = ({ panels,
 const StyledModal = styled(Modal)`
   .ant-modal-title {
     font-size: 14px;
+    font-weight: 500;
   }
   .ant-modal-close {
-    top: 4px;
-    right: 4px;
+    top: 8px;
+    right: 8px;
   }
 `
 
-const LeftMenu = styled.div`
+const ContentContainer = styled.div`
   display: flex;
-  height: 100%;
-  border-right: 0.5px solid var(--color-border);
+  flex-direction: column;
 `
 
-const SettingsContentPanel = styled.div`
-  flex: 1;
-  padding: 16px 16px;
-  overflow-y: scroll;
+const FooterContainer = styled.div`
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
 `
 
-const StyledMenu = styled(Menu)`
-  width: 200px;
-  padding: 5px;
-  background: transparent;
-  margin-top: 2px;
-  border-inline-end: none !important;
+const AdvancedSettingsContainer = styled.div`
+  margin-top: 16px;
+  padding-top: 16px;
+  border-top: 0.5px solid var(--color-border);
+`
 
-  .ant-menu-item {
-    height: 36px;
-    color: var(--color-text-2);
-    display: flex;
-    align-items: center;
-    border: 0.5px solid transparent;
-    border-radius: 6px;
-    margin-bottom: 7px;
-
-    .ant-menu-title-content {
-      line-height: 36px;
-    }
-  }
-  .ant-menu-item-active {
-    background-color: var(--color-background-soft) !important;
-    transition: none;
-  }
-  .ant-menu-item-selected {
-    background-color: var(--color-background-soft);
-    border: 0.5px solid var(--color-border);
-    .ant-menu-title-content {
-      color: var(--color-text-1);
-      font-weight: 500;
-    }
-  }
+const AdvancedSettingsTitle = styled.div`
+  font-weight: 500;
+  font-size: 14px;
+  color: var(--color-text-1);
+  margin-bottom: 16px;
+  padding: 0 16px;
 `
 
 export default KnowledgeBaseFormModal