diff --git a/CHANGELOG.md b/CHANGELOG.md
index f859b9b..bb22fca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## [main] 0.1.6
 - 针对 0.1.5 无法在 Windows 启动的紧急修复。
 - 修复环境变量中添加 token 失效的问题。
+- 优化工具展示的页面布局。
 
 ## [main] 0.1.5
 - 修复 gemini 获取模型列表时存在 models 前缀的问题
diff --git a/renderer/public/mcp.css b/renderer/public/mcp.css
index 7646049..6aecf24 100644
--- a/renderer/public/mcp.css
+++ b/renderer/public/mcp.css
@@ -227,4 +227,5 @@ a {
 .ͼo,
 .ͼo .cm-gutters {
     background-color: transparent !important;
-}
\ No newline at end of file
+}
+
diff --git a/renderer/src/components/main-panel/chat/chat-box/options/context-length.vue b/renderer/src/components/main-panel/chat/chat-box/options/context-length.vue
index d65f87c..deecf9f 100644
--- a/renderer/src/components/main-panel/chat/chat-box/options/context-length.vue
+++ b/renderer/src/components/main-panel/chat/chat-box/options/context-length.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-tooltip :content="t('context-length')" placement="top">
+    <el-tooltip :content="t('context-length')" placement="top" effect="light">
         <div class="setting-button width-30" @click="showContextLengthDialog = true">
             <span class="iconfont icon-length"></span>
             <span class="value-badge">{{ tabStorage.settings.contextLength }}</span>
diff --git a/renderer/src/components/main-panel/chat/chat-box/options/model.vue b/renderer/src/components/main-panel/chat/chat-box/options/model.vue
index 2f227be..89aa653 100644
--- a/renderer/src/components/main-panel/chat/chat-box/options/model.vue
+++ b/renderer/src/components/main-panel/chat/chat-box/options/model.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-tooltip :content="t('choose-model')" placement="top">
+    <el-tooltip :content="t('choose-model')" placement="top" effect="light">
         <div class="setting-button" @click="showModelDialog = true">
             <span class="iconfont icon-model">
                 {{ currentServerName }}/{{ currentModelName }}
diff --git a/renderer/src/components/main-panel/chat/chat-box/options/parallel-tool-calls.vue b/renderer/src/components/main-panel/chat/chat-box/options/parallel-tool-calls.vue
index a9f58c5..b9f0357 100644
--- a/renderer/src/components/main-panel/chat/chat-box/options/parallel-tool-calls.vue
+++ b/renderer/src/components/main-panel/chat/chat-box/options/parallel-tool-calls.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-tooltip :content="t('parallel-tool-calls')" placement="top">
+    <el-tooltip :content="t('parallel-tool-calls')" placement="top" effect="light">
         <div class="setting-button" :class="{ 'active': tabStorage.settings.parallelToolCalls }" size="small"
             @click="toggle">
             <span class="iconfont icon-parallel"></span>
diff --git a/renderer/src/components/main-panel/chat/chat-box/options/prompt.vue b/renderer/src/components/main-panel/chat/chat-box/options/prompt.vue
index 9ccef1e..52ecfaa 100644
--- a/renderer/src/components/main-panel/chat/chat-box/options/prompt.vue
+++ b/renderer/src/components/main-panel/chat/chat-box/options/prompt.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-tooltip :content="t('prompts')" placement="top">
+    <el-tooltip :content="t('prompts')" placement="top" effect="light">
         <div class="setting-button" @click="showChoosePrompt = true; saveCursorPosition();">
             <span class="iconfont icon-chat"></span>
         </div>
diff --git a/renderer/src/components/main-panel/chat/chat-box/options/resource.vue b/renderer/src/components/main-panel/chat/chat-box/options/resource.vue
index e3ea794..7c72ac2 100644
--- a/renderer/src/components/main-panel/chat/chat-box/options/resource.vue
+++ b/renderer/src/components/main-panel/chat/chat-box/options/resource.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-tooltip :content="t('resources')" placement="top">
+    <el-tooltip :content="t('resources')" placement="top" effect="light">
         <div class="setting-button" @click="showChooseResource = true; saveCursorPosition();">
             <span class="iconfont icon-file"></span>
         </div>
diff --git a/renderer/src/components/main-panel/chat/chat-box/options/system-prompt.vue b/renderer/src/components/main-panel/chat/chat-box/options/system-prompt.vue
index c04ab23..68fc7d7 100644
--- a/renderer/src/components/main-panel/chat/chat-box/options/system-prompt.vue
+++ b/renderer/src/components/main-panel/chat/chat-box/options/system-prompt.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-tooltip :content="t('system-prompt')" placement="top">
+    <el-tooltip :content="t('system-prompt')" placement="top" effect="light">
         <div class="setting-button" :class="{ 'active': hasSystemPrompt }" size="small"
             @click="showSystemPromptDialog = true">
             <span class="iconfont icon-prompt"></span>
diff --git a/renderer/src/components/main-panel/chat/chat-box/options/temperature.vue b/renderer/src/components/main-panel/chat/chat-box/options/temperature.vue
index 246413e..4135068 100644
--- a/renderer/src/components/main-panel/chat/chat-box/options/temperature.vue
+++ b/renderer/src/components/main-panel/chat/chat-box/options/temperature.vue
@@ -1,5 +1,5 @@
 <template>
-		<el-tooltip :content="t('temperature-parameter')" placement="top">
+		<el-tooltip :content="t('temperature-parameter')" placement="top" effect="light">
 			<div class="setting-button width-30" @click="showTemperatureSlider = true">
 				<span class="iconfont icon-temperature"></span>
 				<span class="value-badge">{{ tabStorage.settings.temperature.toFixed(1) }}</span>
diff --git a/renderer/src/components/main-panel/chat/chat-box/options/tool-use.vue b/renderer/src/components/main-panel/chat/chat-box/options/tool-use.vue
index f85a926..d877a41 100644
--- a/renderer/src/components/main-panel/chat/chat-box/options/tool-use.vue
+++ b/renderer/src/components/main-panel/chat/chat-box/options/tool-use.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-tooltip :content="t('tool-use')" placement="top">
+    <el-tooltip :content="t('tool-use')" placement="top" effect="light">
         <div class="setting-button" :class="{ 'active': availableToolsNum > 0 }" size="small" @click="toggleTools">
             <span class="iconfont icon-tool badge-outer">
                 <span class="badge-inner">
@@ -10,7 +10,21 @@
 
     </el-tooltip>
 
-    <el-dialog v-model="showToolsDialog" title="工具管理" width="800px">
+    <el-dialog v-model="showToolsDialog" width="800px">
+
+        <template #header>
+            <div>
+                <span>{{ t('tool-manage') }}</span>
+                <el-tooltip :content="t('enable-xml-wrapper')" placement="top" effect="light">
+                        <span class="xml-tag" :class="{
+                        'active': tabStorage.settings.enableXmlWrapper
+                    }"
+                        @click="tabStorage.settings.enableXmlWrapper = !tabStorage.settings.enableXmlWrapper"
+                    >xml</span>
+                </el-tooltip>
+            </div>
+        </template>
+
         <div class="tools-dialog-container">
             <el-scrollbar height="400px" class="tools-list">
                 <div v-for="(tool, index) in tabStorage.settings.enableTools" :key="index" class="tool-item">
@@ -23,12 +37,15 @@
             </el-scrollbar>
 
             <el-scrollbar height="400px" class="schema-viewer">
-                <div v-html="activeToolsSchemaHTML"></div>
+                <!-- 如果激活 xml 指令包裹，则展示对应的 prompt -->
+                <div v-if="tabStorage.settings.enableXmlWrapper" v-html="activeToolsXmlPrompt" />
+                <!-- 如果是普通模式，则展示普通的工具列表 -->
+                <div v-else v-html="activeToolsSchemaHTML" />
             </el-scrollbar>
         </div>
         <template #footer>
-            <el-button type="primary" @click="enableAllTools">激活所有工具</el-button>
-            <el-button type="danger" @click="disableAllTools">禁用所有工具</el-button>
+            <el-button type="primary" @click="enableAllTools">{{ t('enable-all-tools') }}</el-button>
+            <el-button type="danger" @click="disableAllTools">{{ t('disable-all-tools') }}</el-button>
             <el-button type="primary" @click="showToolsDialog = false">{{ t("cancel") }}</el-button>
         </template>
     </el-dialog>
@@ -40,6 +57,7 @@ import { useI18n } from 'vue-i18n';
 import { type ChatStorage, type EnableToolItem, getToolSchema } from '../chat';
 import { markdownToHtml } from '@/components/main-panel/chat/markdown/markdown';
 import { mcpClientAdapter } from '@/views/connect/core';
+import { toolSchemaToPromptDescription } from '../../core/prompt';
 
 const { t } = useI18n();
 
@@ -65,6 +83,17 @@ const activeToolsSchemaHTML = computed(() => {
 	);
 });
 
+const activeToolsXmlPrompt = computed(() => {
+    if (tabStorage.settings.enableXmlWrapper) {
+	    const prompt = toolSchemaToPromptDescription(tabStorage.settings.enableTools);
+        return markdownToHtml(
+            "```markdown\n" + prompt + "\n```"
+        );
+    } else {
+        return '';
+    }
+});
+
 // 新增方法 - 激活所有工具
 const enableAllTools = () => {
 	tabStorage.settings.enableTools.forEach(tool => {
@@ -121,4 +150,24 @@ onMounted(async () => {
 
 </script>
 
-<style></style>
\ No newline at end of file
+<style scoped>
+
+.xml-tag {
+    margin-left: 10px;
+    border-radius: .5em;
+    padding: 2px 5px;
+    font-size: 12px;
+    font-weight: 900;
+    color: black;
+    background-color: var(--main-color);
+    opacity: 0.3;
+    transition: var(--animation-3s);
+    cursor: pointer;
+}
+
+.xml-tag.active {
+    opacity: 1;
+    transition: var(--animation-3s);
+}
+
+</style>
\ No newline at end of file
diff --git a/renderer/src/components/main-panel/chat/chat-box/options/websearch.vue b/renderer/src/components/main-panel/chat/chat-box/options/websearch.vue
index 1acfa8f..4c06b86 100644
--- a/renderer/src/components/main-panel/chat/chat-box/options/websearch.vue
+++ b/renderer/src/components/main-panel/chat/chat-box/options/websearch.vue
@@ -1,5 +1,5 @@
 <template>
-		<el-tooltip :content="t('websearch')" placement="top">
+		<el-tooltip :content="t('websearch')" placement="top" effect="light">
 			<div class="setting-button" :class="{ 'active': tabStorage.settings.enableWebSearch }" size="small"
 				@click="toggleWebSearch">
 				<span class="iconfont icon-web"></span>
diff --git a/renderer/src/components/main-panel/chat/chat-box/options/xml-wrapper.vue b/renderer/src/components/main-panel/chat/chat-box/options/xml-wrapper.vue
index 1a48f68..dfa8333 100644
--- a/renderer/src/components/main-panel/chat/chat-box/options/xml-wrapper.vue
+++ b/renderer/src/components/main-panel/chat/chat-box/options/xml-wrapper.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-tooltip :content="t('enable-xml-wrapper')" placement="top">
+    <el-tooltip :content="t('enable-xml-wrapper')" placement="top" effect="light">
         <div class="setting-button" :class="{ 'active': tabStorage.settings.enableXmlWrapper }" size="small"
             @click="toggle">
             <span class="iconfont icon-suffix-xml"></span>
diff --git a/renderer/src/components/main-panel/chat/chat-box/prompt-chat-item.vue b/renderer/src/components/main-panel/chat/chat-box/prompt-chat-item.vue
index 81e6ba2..0453fc8 100644
--- a/renderer/src/components/main-panel/chat/chat-box/prompt-chat-item.vue
+++ b/renderer/src/components/main-panel/chat/chat-box/prompt-chat-item.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-tooltip :content="props.messages[0].content.text" placement="top">
+    <el-tooltip :content="props.messages[0].content.text" placement="top" effect="light">
         <span class="chat-prompt-item" contenteditable="false">
             <span class="iconfont icon-chat"></span>
             <span class="real-text">{{ props.messages[0].content.text }}</span>
diff --git a/renderer/src/components/main-panel/chat/chat-box/resource-chat-item.vue b/renderer/src/components/main-panel/chat/chat-box/resource-chat-item.vue
index e22a3bc..c31b1c7 100644
--- a/renderer/src/components/main-panel/chat/chat-box/resource-chat-item.vue
+++ b/renderer/src/components/main-panel/chat/chat-box/resource-chat-item.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-tooltip placement="top">
+    <el-tooltip placement="top" effect="light">
         <template #content>
             <div class="resource-chat-item-tooltip">
                 <div v-for="(item, index) of toolRenderItems" :key="index">
diff --git a/renderer/src/components/main-panel/chat/core/prompt.ts b/renderer/src/components/main-panel/chat/core/prompt.ts
index 333938e..e66a8b9 100644
--- a/renderer/src/components/main-panel/chat/core/prompt.ts
+++ b/renderer/src/components/main-panel/chat/core/prompt.ts
@@ -28,7 +28,7 @@ export function toolSchemaToPromptDescription(tools: ToolItem[]) {
             
             Object.entries(tool.inputSchema.properties).forEach(([name, prop]) => {
                 const required = tool.inputSchema.required?.includes(name) || false;
-                prompt += `- \`${name}\`: ${prop.description || '无描述'} (${prop.type}) ${required ? '(required)' : ''}\n`;
+                prompt += `- \`${name}\`: ${prop.description || 'No Description'} (${prop.type}) ${required ? '(required)' : ''}\n`;
             });
             
             prompt += '\n';
diff --git a/renderer/src/components/main-panel/tool/tool-list.vue b/renderer/src/components/main-panel/tool/tool-list.vue
index 798dcb7..f8f4c05 100644
--- a/renderer/src/components/main-panel/tool/tool-list.vue
+++ b/renderer/src/components/main-panel/tool/tool-list.vue
@@ -158,9 +158,5 @@ onMounted(async () => {
 .tool-description {
     opacity: 0.6;
     font-size: 12.5px;
-    max-width: 150px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
 }
 </style>
\ No newline at end of file
diff --git a/renderer/src/components/sidebar/connected.vue b/renderer/src/components/sidebar/connected.vue
index 101a5b3..73fadbc 100644
--- a/renderer/src/components/sidebar/connected.vue
+++ b/renderer/src/components/sidebar/connected.vue
@@ -2,7 +2,7 @@
 	<div v-if="!isConnecting" class="connected-status-container" id="connected-status-container"
 		@click.stop="toggleConnectionPanel()" :class="{ 'connected': client.connectionResult.success }">
 		<span class="mcp-server-info">
-			<el-tooltip class="extra-connect-container" effect="dark" placement="right"
+			<el-tooltip class="extra-connect-container" effect="light" placement="right"
 				:content="fullDisplayServerName">
 				<span class="name">{{ displayServerName }}</span>
 			</el-tooltip>
@@ -20,7 +20,7 @@
 	</div>
 	<div v-else class="connected-status-container">
 		<span class="mcp-server-info">
-			<el-tooltip class="extra-connect-container" effect="dark" placement="right"
+			<el-tooltip class="extra-connect-container" effect="light" placement="right"
 				:content="fullDisplayServerName">
 				<span class="name">
 					加载中
diff --git a/renderer/src/components/sidebar/sidebar-item-container.vue b/renderer/src/components/sidebar/sidebar-item-container.vue
index 9655c7a..6a44b81 100644
--- a/renderer/src/components/sidebar/sidebar-item-container.vue
+++ b/renderer/src/components/sidebar/sidebar-item-container.vue
@@ -3,7 +3,7 @@
 		<div v-for="(item, index) of sidebarItems" :key="index"
 			:id="`sidebar-${item.ident}`"
 		>
-			<el-tooltip :content="t(item.ident)" placement="right">
+			<el-tooltip :content="t(item.ident)" placement="right" effect="light">
 				<div class="sidebar-option-item" :class="{ 'active': isActive(item.ident) }"
 					@click="gotoOption(item.ident)">
 					<span :class="`iconfont ${item.icon}`"></span>
diff --git a/renderer/src/i18n/ar.json b/renderer/src/i18n/ar.json
index 01c10e5..6653609 100644
--- a/renderer/src/i18n/ar.json
+++ b/renderer/src/i18n/ar.json
@@ -172,5 +172,8 @@
     "comment-for-us": "Écrivez un avis pour nous !",
     "openmcp-developed-by": "OpenMCP Client {version} développé par {author}",
     "error-parse-json": "Erreur d'analyse JSON :",
-    "enable-xml-wrapper": "تمكين تغليف تعليمات XML"
+    "enable-xml-wrapper": "تمكين تغليف تعليمات XML",
+    "tool-manage": "إدارة الأدوات",
+    "enable-all-tools": "تفعيل جميع الأدوات",
+    "disable-all-tools": "تعطيل جميع الأدوات"
 }
\ No newline at end of file
diff --git a/renderer/src/i18n/de.json b/renderer/src/i18n/de.json
index fd3fafc..0bc0608 100644
--- a/renderer/src/i18n/de.json
+++ b/renderer/src/i18n/de.json
@@ -172,5 +172,8 @@
     "comment-for-us": "Écrivez un avis pour nous !",
     "openmcp-developed-by": "OpenMCP Client {version} développé par {author}",
     "error-parse-json": "Erreur d'analyse JSON :",
-    "enable-xml-wrapper": "XML-Befehlsverpackung aktivieren"
+    "enable-xml-wrapper": "XML-Befehlsverpackung aktivieren",
+    "tool-manage": "Werkzeugverwaltung",
+    "enable-all-tools": "Alle Tools aktivieren",
+    "disable-all-tools": "Alle Tools deaktivieren"
 }
\ No newline at end of file
diff --git a/renderer/src/i18n/en.json b/renderer/src/i18n/en.json
index 11b99a0..8486450 100644
--- a/renderer/src/i18n/en.json
+++ b/renderer/src/i18n/en.json
@@ -172,5 +172,8 @@
     "comment-for-us": "Écrivez un avis pour nous !",
     "openmcp-developed-by": "OpenMCP Client {version} développé par {author}",
     "error-parse-json": "Erreur d'analyse JSON :",
-    "enable-xml-wrapper": "Enable XML command wrapping"
+    "enable-xml-wrapper": "Enable XML command wrapping",
+    "tool-manage": "Tool Management",
+    "enable-all-tools": "Activate all tools",
+    "disable-all-tools": "Disable all tools"
 }
\ No newline at end of file
diff --git a/renderer/src/i18n/fr.json b/renderer/src/i18n/fr.json
index caade28..1d2086c 100644
--- a/renderer/src/i18n/fr.json
+++ b/renderer/src/i18n/fr.json
@@ -172,5 +172,8 @@
     "comment-for-us": "Écrivez un avis pour nous !",
     "openmcp-developed-by": "OpenMCP Client {version} développé par {author}",
     "error-parse-json": "Erreur d'analyse JSON :",
-    "enable-xml-wrapper": "Activer l'encapsulation de commande XML"
+    "enable-xml-wrapper": "Activer l'encapsulation de commande XML",
+    "tool-manage": "Gestion des outils",
+    "enable-all-tools": "Activer tous les outils",
+    "disable-all-tools": "Désactiver tous les outils"
 }
\ No newline at end of file
diff --git a/renderer/src/i18n/ja.json b/renderer/src/i18n/ja.json
index 096a56d..ba6138d 100644
--- a/renderer/src/i18n/ja.json
+++ b/renderer/src/i18n/ja.json
@@ -172,5 +172,8 @@
     "comment-for-us": "Écrivez un avis pour nous !",
     "openmcp-developed-by": "OpenMCP Client {version} développé par {author}",
     "error-parse-json": "Erreur d'analyse JSON :",
-    "enable-xml-wrapper": "XMLコマンドラッピングを有効にする"
+    "enable-xml-wrapper": "XMLコマンドラッピングを有効にする",
+    "tool-manage": "ツール管理",
+    "enable-all-tools": "すべてのツールを有効にする",
+    "disable-all-tools": "すべてのツールを無効にする"
 }
\ No newline at end of file
diff --git a/renderer/src/i18n/ko.json b/renderer/src/i18n/ko.json
index 56d690e..5412f79 100644
--- a/renderer/src/i18n/ko.json
+++ b/renderer/src/i18n/ko.json
@@ -172,5 +172,8 @@
     "comment-for-us": "Écrivez un avis pour nous !",
     "openmcp-developed-by": "OpenMCP Client {version} développé par {author}",
     "error-parse-json": "Erreur d'analyse JSON :",
-    "enable-xml-wrapper": "XML 명령 래핑 활성화"
+    "enable-xml-wrapper": "XML 명령 래핑 활성화",
+    "tool-manage": "도구 관리",
+    "enable-all-tools": "모든 도구 활성화",
+    "disable-all-tools": "모든 도구 비활성화"
 }
\ No newline at end of file
diff --git a/renderer/src/i18n/ru.json b/renderer/src/i18n/ru.json
index e53ba95..411d575 100644
--- a/renderer/src/i18n/ru.json
+++ b/renderer/src/i18n/ru.json
@@ -172,5 +172,8 @@
     "comment-for-us": "Écrivez un avis pour nous !",
     "openmcp-developed-by": "OpenMCP Client {version} développé par {author}",
     "error-parse-json": "Erreur d'analyse JSON :",
-    "enable-xml-wrapper": "Включить обёртку XML-команд"
+    "enable-xml-wrapper": "Включить обёртку XML-команд",
+    "tool-manage": "Управление инструментами",
+    "enable-all-tools": "Активировать все инструменты",
+    "disable-all-tools": "Отключить все инструменты"
 }
\ No newline at end of file
diff --git a/renderer/src/i18n/zh-cn.json b/renderer/src/i18n/zh-cn.json
index 435438b..394a54b 100644
--- a/renderer/src/i18n/zh-cn.json
+++ b/renderer/src/i18n/zh-cn.json
@@ -172,5 +172,8 @@
     "comment-for-us": "为我们撰写评价！",
     "openmcp-developed-by": "OpenMCP Client {version} 由 {author} 开发",
     "error-parse-json": "JSON 解析错误:",
-    "enable-xml-wrapper": "开启 XML 指令包裹"
+    "enable-xml-wrapper": "开启 XML 指令包裹",
+    "tool-manage": "工具管理",
+    "enable-all-tools": "激活所有工具",
+    "disable-all-tools": "禁用所有工具"
 }
\ No newline at end of file
diff --git a/renderer/src/i18n/zh-tw.json b/renderer/src/i18n/zh-tw.json
index f58a758..f7dfa5a 100644
--- a/renderer/src/i18n/zh-tw.json
+++ b/renderer/src/i18n/zh-tw.json
@@ -172,5 +172,8 @@
     "comment-for-us": "Écrivez un avis pour nous !",
     "openmcp-developed-by": "OpenMCP Client {version} développé par {author}",
     "error-parse-json": "Erreur d'analyse JSON :",
-    "enable-xml-wrapper": "開啟 XML 指令包裹"
+    "enable-xml-wrapper": "開啟 XML 指令包裹",
+    "tool-manage": "工具管理",
+    "enable-all-tools": "啟用所有工具",
+    "disable-all-tools": "禁用所有工具"
 }
\ No newline at end of file