diff --git a/web/src/app/home/bots/botConfig.module.css b/web/src/app/home/bots/botConfig.module.css
index ae201324..80fa5f2c 100644
--- a/web/src/app/home/bots/botConfig.module.css
+++ b/web/src/app/home/bots/botConfig.module.css
@@ -13,7 +13,7 @@
     align-self: flex-start;
     justify-self: flex-start;
     width: calc(100% - 60px);
-    margin:  auto;
+    margin: auto;
     display: grid;
     grid-template-rows: repeat(auto-fill, minmax(220px, 1fr));
     grid-template-columns: repeat(auto-fill, minmax(360px, 1fr));
diff --git a/web/src/app/home/bots/page.tsx b/web/src/app/home/bots/page.tsx
index fdd32f59..c2760b01 100644
--- a/web/src/app/home/bots/page.tsx
+++ b/web/src/app/home/bots/page.tsx
@@ -1,162 +1,168 @@
-"use client"
+"use client";
 
-import {useEffect, useState} from "react";
+import { useEffect, useState } from "react";
 import styles from "./botConfig.module.css";
 import EmptyAndCreateComponent from "@/app/home/components/empty-and-create-component/EmptyAndCreateComponent";
-import {useRouter} from "next/navigation";
-import {BotCardVO} from "@/app/home/bots/components/bot-card/BotCardVO";
-import {Modal, notification, Spin} from "antd";
+import { useRouter } from "next/navigation";
+import { BotCardVO } from "@/app/home/bots/components/bot-card/BotCardVO";
+import { Modal, notification, Spin } from "antd";
 import BotForm from "@/app/home/bots/components/bot-form/BotForm";
 import BotCard from "@/app/home/bots/components/bot-card/BotCard";
-import CreateCardComponent from "@/app/infra/basic-component/create-card-component/CreateCardComponent"
-import {httpClient} from "@/app/infra/http/HttpClient";
+import CreateCardComponent from "@/app/infra/basic-component/create-card-component/CreateCardComponent";
+import { httpClient } from "@/app/infra/http/HttpClient";
 import { Bot } from "@/app/infra/api/api-types";
 
 export default function BotConfigPage() {
-    const router = useRouter();
-    const [pageShowRule, setPageShowRule] = useState<BotConfigPageShowRule>(BotConfigPageShowRule.NO_BOT)
-    const [modalOpen, setModalOpen] = useState<boolean>(false);
-    const [botList, setBotList] = useState<BotCardVO[]>([])
-    const [isEditForm, setIsEditForm] = useState(false)
-    const [nowSelectedBotCard, setNowSelectedBotCard] = useState<BotCardVO>()
-    const [isLoading, setIsLoading] = useState(false)
+  const router = useRouter();
+  const [pageShowRule, setPageShowRule] = useState<BotConfigPageShowRule>(
+    BotConfigPageShowRule.NO_BOT
+  );
+  const [modalOpen, setModalOpen] = useState<boolean>(false);
+  const [botList, setBotList] = useState<BotCardVO[]>([]);
+  const [isEditForm, setIsEditForm] = useState(false);
+  const [nowSelectedBotCard, setNowSelectedBotCard] = useState<BotCardVO>();
+  const [isLoading, setIsLoading] = useState(false);
 
+  useEffect(() => {
+    // TODO：补齐加载转圈逻辑
+    setIsLoading(true);
+    checkHasLLM().then((hasLLM) => {
+      if (hasLLM) {
+        getBotList();
+      } else {
+        setPageShowRule(BotConfigPageShowRule.NO_LLM);
+        setIsLoading(false);
+      }
+    });
+  }, []);
 
-    useEffect(() => {
-        // TODO：补齐加载转圈逻辑
-        setIsLoading(true)
-        checkHasLLM().then((hasLLM) => {
-            if (hasLLM) {
-                getBotList()
-            } else {
-                setPageShowRule(BotConfigPageShowRule.NO_LLM)
-                setIsLoading(false)
-            }
-        })
-    }, [])
+  async function checkHasLLM(): Promise<boolean> {
+    // NOT IMPL
+    return true;
+  }
 
-    async function checkHasLLM(): Promise<boolean> {
-        // NOT IMPL
-        return true
-    }
+  function getBotList() {
+    httpClient
+      .getBots()
+      .then((resp) => {
+        const botList: BotCardVO[] = resp.bots.map((bot: Bot) => {
+          return new BotCardVO({
+            adapter: bot.adapter,
+            description: bot.description,
+            id: bot.uuid || "",
+            name: bot.name,
+            updateTime: bot.updated_at || "",
+            pipelineName: bot.use_pipeline_name || ""
+          });
+        });
+        if (botList.length === 0) {
+          setPageShowRule(BotConfigPageShowRule.NO_BOT);
+        } else {
+          setPageShowRule(BotConfigPageShowRule.HAVE_BOT);
+        }
+        setBotList(botList);
+      })
+      .catch((err) => {
+        console.error("get bot list error", err);
+        // TODO HACK: need refactor to hook mode Notification, but it's not working under render
+        notification.error({
+          message: "获取机器人列表失败",
+          description: err.message,
+          placement: "bottomRight"
+        });
+      })
+      .finally(() => {
+        setIsLoading(false);
+      });
+  }
 
-    function getBotList() {
-        httpClient.getBots().then((resp) => {
-            const botList: BotCardVO[] = resp.bots.map((bot: Bot) => {
-                return new BotCardVO({
-                    adapter: bot.adapter,
-                    description: bot.description,
-                    id: bot.uuid || "",
-                    name: bot.name,
-                    updateTime: bot.updated_at || "",
-                    pipelineName: bot.use_pipeline_name || "",
-                })
-            })
-            if (botList.length === 0) {
-                setPageShowRule(BotConfigPageShowRule.NO_BOT)
-            } else {
-                setPageShowRule(BotConfigPageShowRule.HAVE_BOT)
-            }
-            setBotList(botList)
-        }).catch((err) => {
-            console.error("get bot list error", err)
-            // TODO HACK: need refactor to hook mode Notification, but it's not working under render
-            notification.error({
-                message: "获取机器人列表失败",
-                description: err.message,
-                placement: "bottomRight",
-            })
-        }).finally(() => {
-            setIsLoading(false)
-        })
-    }
+  function handleCreateBotClick() {
+    setIsEditForm(false);
+    setNowSelectedCard(undefined);
+    setModalOpen(true);
+  }
 
-    function handleCreateBotClick() {
-        setIsEditForm(false)
-        setNowSelectedCard(undefined)
-        setModalOpen(true);
-    }
+  function setNowSelectedCard(cardVO: BotCardVO | undefined) {
+    setNowSelectedBotCard(cardVO);
+  }
 
-    function setNowSelectedCard(cardVO: BotCardVO | undefined) {
-        setNowSelectedBotCard(cardVO)
-    }
+  function selectBot(cardVO: BotCardVO) {
+    setIsEditForm(true);
+    setNowSelectedCard(cardVO);
+    console.log("set now vo", cardVO);
+    setModalOpen(true);
+  }
 
-    function selectBot(cardVO: BotCardVO) {
-        setIsEditForm(true)
-        setNowSelectedCard(cardVO)
-        console.log("set now vo", cardVO)
-        setModalOpen(true)
-    }
+  return (
+    <div className={styles.configPageContainer}>
+      <Spin spinning={isLoading} tip="加载中..." size="large">
+        <Modal
+          title={isEditForm ? "编辑机器人" : "创建机器人"}
+          centered
+          open={modalOpen}
+          onOk={() => setModalOpen(false)}
+          onCancel={() => setModalOpen(false)}
+          width={700}
+          footer={null}
+          destroyOnClose={true}
+        >
+          <BotForm
+            initBotId={nowSelectedBotCard?.id}
+            onFormSubmit={() => {
+              getBotList();
+              setModalOpen(false);
+            }}
+            onFormCancel={() => setModalOpen(false)}
+          />
+        </Modal>
+        {pageShowRule === BotConfigPageShowRule.NO_LLM && (
+          <EmptyAndCreateComponent
+            title={"需要先创建大模型才能配置机器人哦～"}
+            subTitle={"快去创建一个吧！"}
+            buttonText={"创建大模型 GO！"}
+            onButtonClick={() => {
+              router.push("/home/models");
+            }}
+          />
+        )}
 
-    return (
-        <Spin spinning={isLoading}>
-        <div className={styles.configPageContainer}>
-            <Modal
-                title={isEditForm ? "编辑机器人" : "创建机器人"}
-                centered
-                open={modalOpen}
-                onOk={() => setModalOpen(false)}
-                onCancel={() => setModalOpen(false)}
-                width={700}
-                footer={null}
-                destroyOnClose={true}
-            >
-                <BotForm
-                    initBotId={nowSelectedBotCard?.id}
-                    onFormSubmit={() => {
-                        getBotList()
-                        setModalOpen(false)
-                    }}
-                    onFormCancel={() => setModalOpen(false)}
-                />
-            </Modal>
-            {pageShowRule === BotConfigPageShowRule.NO_LLM &&
-                <EmptyAndCreateComponent
-                    title={"需要先创建大模型才能配置机器人哦～"}
-                    subTitle={"快去创建一个吧！"}
-                    buttonText={"创建大模型 GO！"}
-                    onButtonClick={() => {
-                        router.push("/home/models");
-                    }}
-                />
-            }
-
-            {pageShowRule === BotConfigPageShowRule.NO_BOT &&
-                 <EmptyAndCreateComponent
-                     title={"您还未配置机器人哦～"}
-                     subTitle={"快去创建一个吧！"}
-                     buttonText={"创建机器人 +"}
-                     onButtonClick={handleCreateBotClick}
-                 />
-            }
-
-            {pageShowRule === BotConfigPageShowRule.HAVE_BOT &&
-             <div className={`${styles.botListContainer}`}
-             >
-                 {botList.map(cardVO => {
-                     return (
-                     <div
-                         key={cardVO.id}
-                         onClick={() => {selectBot(cardVO)}}
-                     >
-                        <BotCard botCardVO={cardVO} />
-                     </div>)
-                 })}
-                 <CreateCardComponent
-                     width={360}
-                     height={200}
-                     plusSize={90}
-                     onClick={handleCreateBotClick}
-                 />
-             </div>
-            }
+        {pageShowRule === BotConfigPageShowRule.NO_BOT && (
+          <EmptyAndCreateComponent
+            title={"您还未配置机器人哦～"}
+            subTitle={"快去创建一个吧！"}
+            buttonText={"创建机器人 +"}
+            onButtonClick={handleCreateBotClick}
+          />
+        )}
+      </Spin>
+      {/* 注意：其余的返回内容需要保持在Spin组件外部 */}
+      {pageShowRule === BotConfigPageShowRule.HAVE_BOT && (
+        <div className={`${styles.botListContainer}`}>
+          {botList.map((cardVO) => {
+            return (
+              <div
+                key={cardVO.id}
+                onClick={() => {
+                  selectBot(cardVO);
+                }}
+              >
+                <BotCard botCardVO={cardVO} />
+              </div>
+            );
+          })}
+          <CreateCardComponent
+            height={200}
+            plusSize={90}
+            onClick={handleCreateBotClick}
+          />
         </div>
-        </Spin>
-    )
+      )}
+    </div>
+  );
 }
 
 enum BotConfigPageShowRule {
-    NO_LLM,
-    NO_BOT,
-    HAVE_BOT,
-}
\ No newline at end of file
+  NO_LLM,
+  NO_BOT,
+  HAVE_BOT
+}
diff --git a/web/src/app/home/components/home-sidebar/HomeSidebar.tsx b/web/src/app/home/components/home-sidebar/HomeSidebar.tsx
index 12813b29..7a950e91 100644
--- a/web/src/app/home/components/home-sidebar/HomeSidebar.tsx
+++ b/web/src/app/home/components/home-sidebar/HomeSidebar.tsx
@@ -67,34 +67,42 @@ export default function HomeSidebar({
     }
   }
 
-  return (
-    <div className={`${styles.sidebarContainer}`}>
-      {/* LangBot、ICON区域 */}
-      <div className={`${styles.langbotIconContainer}`}>
-        {/* icon */}
-        <div className={`${styles.langbotIcon}`}>L</div>
-        <div className={`${styles.langbotText}`}>Langbot</div>
-      </div>
-      {/* 菜单列表，后期可升级成配置驱动 */}
-      <div>
-        {sidebarConfigList.map((config) => {
-          return (
-            <div
-              key={config.id}
-              onClick={() => {
-                console.log("click:", config.id);
-                handleChildClick(config);
-              }}
-            >
-              <SidebarChild
-                isSelected={selectedChild.id === config.id}
-                icon={config.icon}
-                name={config.name}
-              />
+
+    return (
+        <div className={`${styles.sidebarContainer}`}>
+            {/* LangBot、ICON区域 */}
+            <div className={`${styles.langbotIconContainer}`}>
+                {/* icon */}
+                <div className={`${styles.langbotIcon}`}>
+                    L
+                </div>
+                <div className={`${styles.langbotText}`}>
+                    Langbot
+                </div>
             </div>
-          );
-        })}
-      </div>
-    </div>
-  );
-}
+            {/* 菜单列表，后期可升级成配置驱动 */}
+            <div>
+                {
+                    sidebarConfigList.map(config => {
+                        return (
+                            <div
+                                key={config.id}
+                                onClick={() => {
+                                    console.log('click:', config.id)
+                                    handleChildClick(config)
+                                }}
+                            >
+                                <SidebarChild
+                                    isSelected={selectedChild.id === config.id}
+                                    icon={config.icon}
+                                    name={config.name}
+                                />
+                            </div>
+                        )
+                    })
+                }
+
+            </div>
+        </div>
+    );
+}
\ No newline at end of file
diff --git a/web/src/app/home/layout.module.css b/web/src/app/home/layout.module.css
index bcbdc800..8bc33e35 100644
--- a/web/src/app/home/layout.module.css
+++ b/web/src/app/home/layout.module.css
@@ -1,3 +1,4 @@
+/* 主布局容器 */
 .homeLayoutContainer {
     width: 100vw;
     height: 100vh;
@@ -5,14 +6,12 @@
     flex-direction: row;
 }
 
+/* 主内容区域 */
 .main {
+    background-color: #f5f5f7;
+    padding: 0;
+    overflow: auto;
     width: 100%;
     height: 100%;
-    background-color: #FAFBFB;
-}
-
-.mainContent {
-    width: calc(100% - 40px);
-    height: calc(100% - 110px);
-    margin: 20px;
+    padding: 20px;
 }
\ No newline at end of file
diff --git a/web/src/app/home/layout.tsx b/web/src/app/home/layout.tsx
index 7985dae6..c765aef0 100644
--- a/web/src/app/home/layout.tsx
+++ b/web/src/app/home/layout.tsx
@@ -1,30 +1,48 @@
-"use client";
+"use client"
 
-import "@ant-design/v5-patch-for-react-19";
-import styles from "./layout.module.css";
+import '@ant-design/v5-patch-for-react-19';
+import styles from "./layout.module.css"
 import HomeSidebar from "@/app/home/components/home-sidebar/HomeSidebar";
 import HomeTitleBar from "@/app/home/components/home-titlebar/HomeTitleBar";
 import React, { useState } from "react";
 import { SidebarChildVO } from "@/app/home/components/home-sidebar/HomeSidebarChild";
+import { useRouter } from 'next/navigation';
+import { Layout } from 'antd';
+
+const { Sider, Content } = Layout;
 
 export default function HomeLayout({
   children
 }: Readonly<{
   children: React.ReactNode;
 }>) {
-  const [title, setTitle] = useState<string>("");
-  const onSelectedChange = (child: SidebarChildVO) => {
-    setTitle(child.name);
-  };
+  const router = useRouter();
+  const [title, setTitle] = useState<string>("")
+  const onSelectedChangeAction = (child: SidebarChildVO) => {
+    setTitle(child.name)
+  }
 
   return (
-    <div className={`${styles.homeLayoutContainer}`}>
-      <HomeSidebar onSelectedChangeAction={onSelectedChange} />
-      <div className={`${styles.main}`}>
+    <Layout className={styles.homeLayoutContainer}>
+      {/* homeLayoutContainer 是整个容器的入口,使用 flex 的左右布局 */}
+
+      <Sider className="left">
+        <HomeSidebar
+          onSelectedChangeAction={onSelectedChangeAction}
+        />
+        {/* HomeSidebar 为侧边栏 */}
+      </Sider>
+
+      <Layout className="right">
+        {/* right 为内容显示区域，right使用 flex 上下布局，right 使用 flex 布局吃掉剩余部分 */}
+
         <HomeTitleBar title={title} />
-        {/* 主页面 */}
-        <div className={`${styles.mainContent}`}>{children}</div>
-      </div>
-    </div>
-  );
+
+        <Content className={styles.main}>
+          {/* mainContent 为主页面 */}
+          {children}
+        </Content>
+      </Layout>
+    </Layout>
+  )
 }
diff --git a/web/src/app/home/plugins/page.tsx b/web/src/app/home/plugins/page.tsx
index e28db69d..10151b39 100644
--- a/web/src/app/home/plugins/page.tsx
+++ b/web/src/app/home/plugins/page.tsx
@@ -1,6 +1,6 @@
 "use client"
 import { Radio } from 'antd';
-import {useState} from "react";
+import { useState } from "react";
 import PluginInstalledComponent from "@/app/home/plugins/plugin-installed/PluginInstalledComponent";
 import PluginMarketComponent from "@/app/home/plugins/plugin-market/PluginMarketComponent";
 import styles from './plugins.module.css'
@@ -14,33 +14,24 @@ export default function PluginConfigPage() {
     const [nowPageType, setNowPageType] = useState(PageType.INSTALLED)
 
     return (
-        <div className={`${styles.pageContainer}`}>
-            <div>
-                <Radio.Group
-                    block
-                    options={[
-                        { label: '已安装', value: PageType.INSTALLED },
-                        { label: '插件市场', value: PageType.MARKET },
-                    ]}
-                    defaultValue={PageType.INSTALLED}
-                    value={nowPageType}
-                    optionType="button"
-                    buttonStyle="solid"
-                    onChange={(e) => {
-                        // 这里静态类型检测有问题
-                        setNowPageType(e.target.value)
-                    }}
-                />
-            </div>
-            <div className={`${styles.pageContainer}`}>
-                {
-                    nowPageType === PageType.INSTALLED && <PluginInstalledComponent/>
-                }
-                {
-                    nowPageType === PageType.MARKET && <PluginMarketComponent/>
-                }
-            </div>
+        <div className={styles.pageContainer}>
+            <Radio.Group
+                block
+                options={[
+                    { label: '已安装', value: PageType.INSTALLED },
+                    { label: '插件市场', value: PageType.MARKET },
+                ]}
+                defaultValue={PageType.INSTALLED}
+                value={nowPageType}
+                optionType="button"
+                buttonStyle="solid"
+                style={{ marginBottom: '20px' }}
+                onChange={(e) => {
+                    setNowPageType(e.target.value as PageType)
+                }}
+            />
 
+            {nowPageType === PageType.INSTALLED ? <PluginInstalledComponent /> : <PluginMarketComponent />}
         </div>
     );
 }
diff --git a/web/src/app/home/plugins/plugin-installed/PluginInstalledComponent.tsx b/web/src/app/home/plugins/plugin-installed/PluginInstalledComponent.tsx
index 1b5cea43..b6e149ae 100644
--- a/web/src/app/home/plugins/plugin-installed/PluginInstalledComponent.tsx
+++ b/web/src/app/home/plugins/plugin-installed/PluginInstalledComponent.tsx
@@ -1,8 +1,8 @@
 "use client";
 
+import { useState, useEffect } from "react";
 import CreateCardComponent from "@/app/infra/basic-component/create-card-component/CreateCardComponent";
 import { PluginCardVO } from "@/app/home/plugins/plugin-installed/PluginCardVO";
-import { useEffect, useState } from "react";
 import PluginCardComponent from "@/app/home/plugins/plugin-installed/plugin-card/PluginCardComponent";
 import styles from "@/app/home/plugins/plugins.module.css";
 import { Modal, Input } from "antd";
@@ -66,16 +66,12 @@ export default function PluginInstalledComponent() {
                 fontSize: "30px",
                 marginRight: "20px"
               }}
-              type="setting"
             />
-            <span>从 GitHub 安装插件</span>
           </div>
         }
-        centered
         open={modalOpen}
-        onOk={() => handleModalConfirm()}
+        onOk={handleModalConfirm}
         onCancel={() => setModalOpen(false)}
-        width={500}
         destroyOnClose={true}
       >
         <div className={`${styles.modalBody}`}>
@@ -95,7 +91,6 @@ export default function PluginInstalledComponent() {
         );
       })}
       <CreateCardComponent
-        width={360}
         height={140}
         plusSize={90}
         onClick={() => {
diff --git a/web/src/app/home/plugins/plugin-installed/plugin-card/PluginCardComponent.tsx b/web/src/app/home/plugins/plugin-installed/plugin-card/PluginCardComponent.tsx
index fcae4000..8999534f 100644
--- a/web/src/app/home/plugins/plugin-installed/plugin-card/PluginCardComponent.tsx
+++ b/web/src/app/home/plugins/plugin-installed/plugin-card/PluginCardComponent.tsx
@@ -46,19 +46,22 @@ export default function PluginCardComponent({
       </div>
       {/*  footer  */}
       <div className={`${styles.cardFooter}`}>
-        <div className={`${styles.linkSettingContainer}`}>
-          <div className={`${styles.link}`}>
-            <LinkOutlined style={{ fontSize: "22px" }} />
-            <span>1</span>
+        <div className={`${styles.footerContainer}`}>
+          <div className={`${styles.linkAndToolContainer}`}>
+            <div className={`${styles.link}`}>
+              <LinkOutlined style={{ fontSize: "22px" }} />
+              <span>1</span>
+            </div>
+            <ToolOutlined style={{ fontSize: "22px" }} />
+          </div>
+          <div className={`${styles.switchContainer}`}>
+            <Switch
+              value={initialized}
+              onClick={handleEnable}
+              disabled={!switchEnable}
+            />
           </div>
-          <ToolOutlined style={{ fontSize: "22px" }} />
         </div>
-
-        <Switch
-          value={initialized}
-          onClick={handleEnable}
-          disabled={!switchEnable}
-        />
       </div>
     </div>
   );
diff --git a/web/src/app/home/plugins/plugin-installed/plugin-card/pluginCard.module.css b/web/src/app/home/plugins/plugin-installed/plugin-card/pluginCard.module.css
index 81ad489a..1d09d462 100644
--- a/web/src/app/home/plugins/plugin-installed/plugin-card/pluginCard.module.css
+++ b/web/src/app/home/plugins/plugin-installed/plugin-card/pluginCard.module.css
@@ -1,5 +1,6 @@
 .cardContainer {
-    width: 360px;
+    width: 100%;
+    /* 修改为 100% 以撑满整个网格单元 */
     height: 140px;
     box-sizing: border-box;
     background-color: #FFF;
@@ -40,12 +41,29 @@
 .cardFooter {
     width: 90%;
     height: 30px;
+    position: relative;
+}
+
+.footerContainer {
+    width: 100%;
+    height: 100%;
     display: flex;
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
 }
 
+.linkAndToolContainer {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 10px;
+}
+
+.switchContainer {
+    display: flex;
+    justify-content: flex-end;
+}
 
 .fontGray {
     color: #6C6C6C;
@@ -73,4 +91,4 @@
         align-self: center;
         justify-content: space-between;
     }
-}
+}
\ No newline at end of file
diff --git a/web/src/app/home/plugins/plugin-market/PluginMarketComponent.tsx b/web/src/app/home/plugins/plugin-market/PluginMarketComponent.tsx
index d01aeb6e..9e84c0ff 100644
--- a/web/src/app/home/plugins/plugin-market/PluginMarketComponent.tsx
+++ b/web/src/app/home/plugins/plugin-market/PluginMarketComponent.tsx
@@ -8,80 +8,100 @@ import { Input, Pagination } from "antd";
 import { spaceClient } from "@/app/infra/http/HttpClient";
 
 export default function PluginMarketComponent() {
-  const [marketPluginList, setMarketPluginList] = useState<
-    PluginMarketCardVO[]
-  >([]);
-  const [totalCount, setTotalCount] = useState(0);
-  const [nowPage, setNowPage] = useState(1);
-  const [searchKeyword, setSearchKeyword] = useState("");
+    const [marketPluginList, setMarketPluginList] = useState<
+        PluginMarketCardVO[]
+    >([]);
+    const [totalCount, setTotalCount] = useState(0);
+    const [nowPage, setNowPage] = useState(1);
+    const [searchKeyword, setSearchKeyword] = useState("");
+    const [loading, setLoading] = useState(false);
+    const pageSize = 10;
 
-  useEffect(() => {
-    initData();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+    useEffect(() => {
+        initData();
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
 
-  function initData() {
-    getPluginList();
-  }
+    function initData() {
+        getPluginList();
+    }
 
-  function onInputSearchKeyword(keyword: string) {
-    // 这里记得加防抖，暂时没加
-    setSearchKeyword(keyword);
-    setNowPage(1);
-    getPluginList(1, keyword);
-  }
+    function onInputSearchKeyword(keyword: string) {
+        // 这里记得加防抖，暂时没加
+        setSearchKeyword(keyword);
+        setNowPage(1);
+        getPluginList(1, keyword);
+    }
 
-  function getPluginList(
-    page: number = nowPage,
-    keyword: string = searchKeyword
-  ) {
-    spaceClient.getMarketPlugins(page, 10, keyword).then((res) => {
-      setMarketPluginList(
-        res.plugins.map(
-          (marketPlugin) =>
-            new PluginMarketCardVO({
-              author: marketPlugin.author,
-              description: marketPlugin.description,
-              githubURL: marketPlugin.repository,
-              name: marketPlugin.name,
-              pluginId: String(marketPlugin.ID),
-              starCount: marketPlugin.stars
-            })
-        )
-      );
-      setTotalCount(res.total);
-      console.log("market plugins:", res);
-    });
-  }
+    function getPluginList(
+        page: number = nowPage,
+        keyword: string = searchKeyword
+    ) {
+        setLoading(true);
+        spaceClient.getMarketPlugins(page, pageSize, keyword).then((res) => {
+            setMarketPluginList(
+                res.plugins.map(
+                    (marketPlugin) =>
+                        new PluginMarketCardVO({
+                            author: marketPlugin.author,
+                            description: marketPlugin.description,
+                            githubURL: marketPlugin.repository,
+                            name: marketPlugin.name,
+                            pluginId: String(marketPlugin.ID),
+                            starCount: marketPlugin.stars,
+                            version: "version" in marketPlugin ? String(marketPlugin.version) : "1.0.0", // Default version if not provided
+                        })
+                )
+            );
+            setTotalCount(res.total);
+            setLoading(false);
+            console.log("market plugins:", res);
+        }).catch(error => {
+            console.error("获取插件列表失败:", error);
+            setLoading(false);
+        });
+    }
 
-  return (
-    <div className={`${styles.marketComponentBody}`}>
-      <Input
-        style={{
-          width: "300px",
-          marginTop: "10px"
-        }}
-        value={searchKeyword}
-        placeholder="搜索插件"
-        onChange={(e) => onInputSearchKeyword(e.target.value)}
-      />
-      <div className={`${styles.pluginListContainer}`}>
-        {marketPluginList.map((vo, index) => {
-          return (
-            <div key={index}>
-              <PluginMarketCardComponent cardVO={vo} />
+    function handlePageChange(page: number) {
+        setNowPage(page);
+        getPluginList(page);
+    }
+
+    return (
+        <div className={`${styles.marketComponentBody}`}>
+            <Input
+                style={{
+                    width: '300px',
+                    marginBottom: '10px',
+                }}
+                value={searchKeyword}
+                placeholder="搜索插件"
+                onChange={(e) => onInputSearchKeyword(e.target.value)}
+            />
+            <div className={`${styles.pluginListContainer}`}>
+                {loading ? (
+                    <div style={{ textAlign: 'center', padding: '20px' }}>加载中...</div>
+                ) : marketPluginList.length === 0 ? (
+                    <div style={{ textAlign: 'center', padding: '20px' }}>没有找到匹配的插件</div>
+                ) : (
+                    marketPluginList.map((vo, index) => (
+                        <div key={`${vo.pluginId}-${index}`}>
+                            <PluginMarketCardComponent cardVO={vo} />
+                        </div>
+                    ))
+                )}
             </div>
-          );
-        })}
-      </div>
-      <Pagination
-        defaultCurrent={1}
-        total={totalCount}
-        onChange={(pageNumber) => {
-          setNowPage(pageNumber);
-          getPluginList(pageNumber);
-        }}
-      />
-    </div>
-  );
+            {totalCount > 0 && (
+                <div style={{ display: 'flex', justifyContent: 'center', width: '100%', marginTop: '20px' }}>
+                    <Pagination
+                        current={nowPage}
+                        total={totalCount}
+                        pageSize={pageSize}
+                        onChange={handlePageChange}
+                        showSizeChanger={false}
+                    />
+                </div>
+            )}
+        </div>
+    )
 }
diff --git a/web/src/app/home/plugins/plugin-market/plugin-market-card/PluginMarketCardComponent.tsx b/web/src/app/home/plugins/plugin-market/plugin-market-card/PluginMarketCardComponent.tsx
index 5d96c57f..dcc1dfd0 100644
--- a/web/src/app/home/plugins/plugin-market/plugin-market-card/PluginMarketCardComponent.tsx
+++ b/web/src/app/home/plugins/plugin-market/plugin-market-card/PluginMarketCardComponent.tsx
@@ -1,56 +1,49 @@
-import styles from "./pluginMarketCard.module.css"
-import {GithubOutlined, StarOutlined} from '@ant-design/icons';
-import {PluginMarketCardVO} from "@/app/home/plugins/plugin-market/plugin-market-card/PluginMarketCardVO";
-import {Button} from "antd";
+import styles from "./pluginMarketCard.module.css";
+import { GithubOutlined, StarOutlined } from "@ant-design/icons";
+import { PluginMarketCardVO } from "@/app/home/plugins/plugin-market/plugin-market-card/PluginMarketCardVO";
+import { Button } from "antd";
 
 export default function PluginMarketCardComponent({
-     cardVO
+  cardVO
 }: {
-    cardVO: PluginMarketCardVO
+  cardVO: PluginMarketCardVO;
 }) {
+  function handleInstallClick(pluginId: string) {
+    console.log("Install plugin: ", pluginId);
+  }
 
-
-    function handleInstallClick (pluginId: string) {
-        console.log("Install plugin: ", pluginId)
-    }
-
-    return (
-        <div className={`${styles.cardContainer}`}>
-            {/*  header  */}
-            <div className={`${styles.cardHeader}`}>
-                {/* left author */}
-                <div className={`${styles.fontGray}`}>{cardVO.author}</div>
-                {/*  right icon */}
-                <GithubOutlined
-                    style={{fontSize: '26px'}}
-                    type="setting"
-                />
-            </div>
-            {/*  content  */}
-            <div className={`${styles.cardContent}`}>
-                <div className={`${styles.boldFont}`}>{cardVO.name}</div>
-                <div className={`${styles.fontGray}`}>{cardVO.description}</div>
-            </div>
-            {/*  footer  */}
-            <div className={`${styles.cardFooter}`}>
-                <div className={`${styles.linkSettingContainer}`}>
-                    <div className={`${styles.link}`}>
-                        <StarOutlined
-                            style={{fontSize: '22px'}}
-                        />
-                        <span>{cardVO.starCount}</span>
-                    </div>
-                </div>
-                <Button
-                    type="primary"
-                    size={"small"}
-                    onClick={() => {
-                        handleInstallClick(cardVO.pluginId)
-                    }}
-                >
-                    安装
-                </Button>
-            </div>
+  return (
+    <div className={`${styles.cardContainer}`}>
+      {/*  header  */}
+      <div className={`${styles.cardHeader}`}>
+        {/* left author */}
+        <div className={`${styles.fontGray}`}>{cardVO.author}</div>
+        {/*  right icon */}
+        <GithubOutlined style={{ fontSize: "26px" }} type="setting" />
+      </div>
+      {/*  content  */}
+      <div className={`${styles.cardContent}`}>
+        <div className={`${styles.boldFont}`}>{cardVO.name}</div>
+        <div className={`${styles.fontGray}`}>{cardVO.description}</div>
+      </div>
+      {/*  footer  */}
+      <div className={`${styles.cardFooter}`}>
+        <div className={`${styles.linkSettingContainer}`}>
+          <div className={`${styles.link}`}>
+            <StarOutlined style={{ fontSize: "22px" }} />
+            <span style={{ paddingLeft: "5px" }}>{cardVO.starCount}</span>
+          </div>
         </div>
-    );
+        <Button
+          type="primary"
+          size={"small"}
+          onClick={() => {
+            handleInstallClick(cardVO.pluginId);
+          }}
+        >
+          安装
+        </Button>
+      </div>
+    </div>
+  );
 }
diff --git a/web/src/app/home/plugins/plugin-market/plugin-market-card/PluginMarketCardVO.ts b/web/src/app/home/plugins/plugin-market/plugin-market-card/PluginMarketCardVO.ts
index 6af3f199..9d508066 100644
--- a/web/src/app/home/plugins/plugin-market/plugin-market-card/PluginMarketCardVO.ts
+++ b/web/src/app/home/plugins/plugin-market/plugin-market-card/PluginMarketCardVO.ts
@@ -5,6 +5,7 @@ export interface IPluginMarketCardVO {
     description: string,
     starCount: number,
     githubURL: string,
+    version: string,
 }
 
 export class PluginMarketCardVO implements IPluginMarketCardVO {
@@ -14,6 +15,7 @@ export class PluginMarketCardVO implements IPluginMarketCardVO {
     author: string;
     githubURL: string;
     starCount: number;
+    version: string;
 
     constructor(prop: IPluginMarketCardVO) {
         this.description = prop.description
@@ -22,5 +24,6 @@ export class PluginMarketCardVO implements IPluginMarketCardVO {
         this.githubURL = prop.githubURL
         this.starCount = prop.starCount
         this.pluginId = prop.pluginId
+        this.version = prop.version
     }
 }
diff --git a/web/src/app/home/plugins/plugin-market/plugin-market-card/pluginMarketCard.module.css b/web/src/app/home/plugins/plugin-market/plugin-market-card/pluginMarketCard.module.css
index f611f335..97a5e224 100644
--- a/web/src/app/home/plugins/plugin-market/plugin-market-card/pluginMarketCard.module.css
+++ b/web/src/app/home/plugins/plugin-market/plugin-market-card/pluginMarketCard.module.css
@@ -1,6 +1,4 @@
 .cardContainer {
-    width: 360px;
-    height: 140px;
     box-sizing: border-box;
     background-color: #FFF;
     border-radius: 9px;
@@ -73,5 +71,6 @@
         color: #6062E7;
         align-self: center;
         justify-content: space-between;
+        align-items: center;
     }
-}
+}
\ No newline at end of file
diff --git a/web/src/app/home/plugins/plugins.module.css b/web/src/app/home/plugins/plugins.module.css
index 1393c15b..24688273 100644
--- a/web/src/app/home/plugins/plugins.module.css
+++ b/web/src/app/home/plugins/plugins.module.css
@@ -1,8 +1,8 @@
 .pageContainer {
     width: 100%;
-    height: calc(100% - 30px);
 }
 
+
 .marketComponentBody {
     width: 100%;
     height: calc(100% - 60px);
@@ -11,17 +11,13 @@
 .pluginListContainer {
     align-self: flex-start;
     justify-self: flex-start;
-    width: calc(100% - 60px);
-    height: 100%;
-    max-height: 100%;
-    margin:  auto;
+    margin: auto;
     display: grid;
     grid-template-rows: repeat(auto-fill, minmax(160px, 1fr));
     grid-template-columns: repeat(auto-fill, minmax(360px, 1fr));
     gap: 15px;
-    justify-items: center;
+    /* justify-items: center; */
     align-items: center;
-    overflow-y: scroll;
 }
 
 .modalTitle {
@@ -35,4 +31,4 @@
     display: flex;
     flex-direction: column;
     justify-content: space-around;
-}
+}
\ No newline at end of file
diff --git a/web/src/app/infra/basic-component/create-card-component/CreateCardComponent.tsx b/web/src/app/infra/basic-component/create-card-component/CreateCardComponent.tsx
index 3e33d712..f1a280fc 100644
--- a/web/src/app/infra/basic-component/create-card-component/CreateCardComponent.tsx
+++ b/web/src/app/infra/basic-component/create-card-component/CreateCardComponent.tsx
@@ -1,12 +1,10 @@
 import styles from "./createCartComponent.module.css";
 
 export default function CreateCardComponent({
-    width,
     height,
     plusSize,
     onClick,
 }: {
-    width: number;
     height: number;
     plusSize: number;
     onClick: () => void
@@ -15,7 +13,7 @@ export default function CreateCardComponent({
         <div
             className={`${styles.cardContainer} ${styles.createCardContainer} `}
             style={{
-                width: `${width}px`,
+                width: `100%`,
                 height: `${height}px`,
                 fontSize: `${plusSize}px`
             }}
diff --git a/web/src/app/infra/http/HttpClient.ts b/web/src/app/infra/http/HttpClient.ts
index a8bb53cc..7183ba59 100644
--- a/web/src/app/infra/http/HttpClient.ts
+++ b/web/src/app/infra/http/HttpClient.ts
@@ -26,7 +26,8 @@ import {
   ApiRespSystemInfo,
   ApiRespAsyncTasks,
   ApiRespAsyncTask,
-  ApiRespUserToken, MarketPluginResponse
+  ApiRespUserToken,
+  MarketPluginResponse
 } from "../api/api-types";
 import { notification } from "antd";
 
@@ -50,22 +51,19 @@ export interface RequestConfig extends AxiosRequestConfig {
 
 class HttpClient {
   private instance: AxiosInstance;
-  private disableToken: boolean = false
+  private disableToken: boolean = false;
   // 暂不需要SSR
   // private ssrInstance: AxiosInstance | null = null
 
-  constructor(
-      baseURL?: string,
-      disableToken?: boolean
-  ) {
+  constructor(baseURL?: string, disableToken?: boolean) {
     this.instance = axios.create({
       baseURL: baseURL || this.getBaseUrl(),
       timeout: 15000,
       headers: {
-        "Content-Type": "application/json",
+        "Content-Type": "application/json"
       }
     });
-    this.disableToken = disableToken || false
+    this.disableToken = disableToken || false;
     this.initInterceptors();
   }
 
@@ -358,7 +356,7 @@ class HttpClient {
   public getMarketPlugins(
     page: number,
     page_size: number,
-    query: string,
+    query: string
   ): Promise<MarketPluginResponse> {
     return this.post(`/api/v1/market/plugins`, {
       page,
@@ -366,7 +364,7 @@ class HttpClient {
       query,
       sort_by: "stars",
       sort_order: "DESC"
-    })
+    });
   }
   public installPluginFromGithub(
     source: string
@@ -415,4 +413,4 @@ class HttpClient {
 export const httpClient = new HttpClient("https://version-4.langbot.dev");
 
 // 临时写法，未来两种Client都继承自HttpClient父类，不允许共享方法
-export const spaceClient = new HttpClient("https://space.langbot.app")
+export const spaceClient = new HttpClient("https://space.langbot.app");
diff --git a/web/src/app/not-found.tsx b/web/src/app/not-found.tsx
index 0d5f0770..7882f911 100644
--- a/web/src/app/not-found.tsx
+++ b/web/src/app/not-found.tsx
@@ -10,66 +10,69 @@ export default function NotFound() {
     const router = useRouter();
 
     return (
-        <Layout style={{ height: '100vh', display: 'flex', background: 'white', justifyContent: 'center' }}>            <Row justify="center" align="middle" style={{ minHeight: '100vh' }}>
-            <div className="error-container" style={{ width: '100%', textAlign: 'center' }}>
-                <div className="error-card" style={{
-                    display: 'flex',
-                    flexDirection: 'column',
-                    alignItems: 'center',
-                    padding: '24px'
-                }}>
-                    {/* Ant Design 图标，可以换成 Langbot 的 Logo */}
-                    <div style={{ marginBottom: '20px', maxWidth: '100%', height: 'auto' }}>
-                        <Result
-                            status="404"
-                            title={null}
-                            subTitle={null}
-                            style={{ padding: 0 }}
-                        />
-                    </div>
+        <Layout style={{ minHeight: '100vh', background: 'white' }}>
+            <Row justify="center" align="middle" style={{ minHeight: '100vh' }}>
+                <Col xs={22} sm={20} md={18} lg={14} xl={10}>
+                    <div className="error-container" style={{ width: '100%', padding: '20px 0', textAlign: 'center' }}>
+                        <div className="error-card" style={{
+                            display: 'flex',
+                            flexDirection: 'column',
+                            alignItems: 'center',
+                            padding: '24px'
+                        }}>
+                            {/* Ant Design 图标，可以换成 Langbot 的 Logo */}
+                            <div style={{ marginBottom: '20px', maxWidth: '100%', height: 'auto' }}>
+                                <Result
+                                    status="404"
+                                    title={null}
+                                    subTitle={null}
+                                    style={{ padding: 0 }}
+                                />
+                            </div>
 
-                    <div className="error-text" style={{ textAlign: 'center', marginBottom: '24px' }}>
-                        <Title level={1} style={{ margin: '0 0 16px 0', fontSize: '72px', fontWeight: 'bold', color: '#333' }}>
-                            404
-                        </Title>
-                        <Title level={3} style={{ margin: '0 0 8px 0', fontWeight: 'normal', color: '#333' }}>
-                            页面不存在
-                        </Title>
-                        <Paragraph style={{ fontSize: '16px', color: '#666', maxWidth: '450px', margin: '0 auto 32px auto' }}>
-                            您要查找的页面似乎不存在。请检查您输入的 URL 是否正确，或者返回首页。
-                        </Paragraph>
-                    </div>
+                            <div className="error-text" style={{ textAlign: 'center', marginBottom: '24px' }}>
+                                <Title level={1} style={{ margin: '0 0 16px 0', fontSize: '72px', fontWeight: 'bold', color: '#333' }}>
+                                    404
+                                </Title>
+                                <Title level={3} style={{ margin: '0 0 8px 0', fontWeight: 'normal', color: '#333' }}>
+                                    页面不存在
+                                </Title>
+                                <Paragraph style={{ fontSize: '16px', color: '#666', maxWidth: '450px', margin: '0 auto 32px auto' }}>
+                                    您要查找的页面似乎不存在。请检查您输入的 URL 是否正确，或者返回首页。
+                                </Paragraph>
+                            </div>
 
-                    <div className="error-button" style={{ marginBottom: '24px' }}>
-                        <Space>
-                            <Button type="primary" style={{
-                                backgroundColor: '#2288ee',
-                                borderColor: '#2288ee',
-                                borderRadius: '4px',
-                                height: '36px',
-                                padding: '0 16px'
-                            }} onClick={() => router.back()}>
-                                上一级
-                            </Button>
-                            <Button style={{
-                                borderColor: '#d9d9d9',
-                                borderRadius: '4px',
-                                height: '36px',
-                                padding: '0 16px'
-                            }} onClick={() => router.push('/')}>
-                                返回主页
-                            </Button>
-                        </Space>
-                    </div>
+                            <div className="error-button" style={{ marginBottom: '24px' }}>
+                                <Space>
+                                    <Button type="primary" style={{
+                                        backgroundColor: '#2288ee',
+                                        borderColor: '#2288ee',
+                                        borderRadius: '4px',
+                                        height: '36px',
+                                        padding: '0 16px'
+                                    }} onClick={() => router.back()}>
+                                        上一级
+                                    </Button>
+                                    <Button style={{
+                                        borderColor: '#d9d9d9',
+                                        borderRadius: '4px',
+                                        height: '36px',
+                                        padding: '0 16px'
+                                    }} onClick={() => router.push('/')}>
+                                        返回主页
+                                    </Button>
+                                </Space>
+                            </div>
 
-                    <div className="error-support" style={{ textAlign: 'center', marginTop: '16px' }}>
-                        <Paragraph style={{ fontSize: '14px', color: '#666' }}>
-                            需要帮助吗？您可以联系 <a href="mailto:support@qq.com" style={{ color: '#000', textDecoration: 'none' }}>support@qq.com</a>
-                        </Paragraph>
+                            <div className="error-support" style={{ textAlign: 'center', marginTop: '16px' }}>
+                                <Paragraph style={{ fontSize: '14px', color: '#666' }}>
+                                    需要帮助吗？您可以联系 <a href="mailto:support@qq.com" style={{ color: '#000', textDecoration: 'none' }}>support@qq.com</a>
+                                </Paragraph>
+                            </div>
+                        </div>
                     </div>
-                </div>
-            </div>
-        </Row>
+                </Col>
+            </Row>
         </Layout>
     );
 }