diff --git a/core/datacap-ui/package.json b/core/datacap-ui/package.json
index f59f18ae1b..8f7f05e106 100644
--- a/core/datacap-ui/package.json
+++ b/core/datacap-ui/package.json
@@ -27,7 +27,7 @@
     "lodash": "^4.17.21",
     "md-editor-v3": "^4.12.1",
     "uuid": "^9.0.1",
-    "view-shadcn-ui": "^2025.1.1",
+    "view-shadcn-ui": "^2025.1.2",
     "vue": "^3.4.21",
     "vue-clipboard3": "^2.0.0",
     "vue-i18n": "^9.10.1",
diff --git a/core/datacap-ui/pnpm-lock.yaml b/core/datacap-ui/pnpm-lock.yaml
index 984ccef4fa..fdd64f6ce7 100644
--- a/core/datacap-ui/pnpm-lock.yaml
+++ b/core/datacap-ui/pnpm-lock.yaml
@@ -63,8 +63,8 @@ importers:
         specifier: ^9.0.1
         version: 9.0.1
       view-shadcn-ui:
-        specifier: ^2025.1.1
-        version: 2025.1.1(typescript@5.2.2)
+        specifier: ^2025.1.2
+        version: 2025.1.2(typescript@5.2.2)
       vue:
         specifier: ^3.4.21
         version: 3.5.12(typescript@5.2.2)
@@ -1469,8 +1469,8 @@ packages:
     resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
     hasBin: true
 
-  view-shadcn-ui@2025.1.1:
-    resolution: {integrity: sha512-7kS4q4zedG7v50o9CgtokoxYEB9njdXSndTomI1kvQyEG7D3CPFbwwOpitX4UbQ+p4esKW7hI9HsNb5sN/+LTg==}
+  view-shadcn-ui@2025.1.2:
+    resolution: {integrity: sha512-B7AjRC2p8h62LNSCdQ18Blo8RB/oExyA/MunhSzyij0+m+dkR1cApt9h9EGPpwNwUnKvGp2wIROZ95muUxg3XA==}
 
   vite@5.4.10:
     resolution: {integrity: sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==}
@@ -3208,7 +3208,7 @@ snapshots:
 
   uuid@9.0.1: {}
 
-  view-shadcn-ui@2025.1.1(typescript@5.2.2):
+  view-shadcn-ui@2025.1.2(typescript@5.2.2):
     dependencies:
       clsx: 2.1.1
       lodash: 4.17.21
diff --git a/core/datacap-ui/src/views/layouts/common/components/LayoutHeader.vue b/core/datacap-ui/src/views/layouts/common/components/LayoutHeader.vue
index 7694f2e95b..f69e92a5ba 100644
--- a/core/datacap-ui/src/views/layouts/common/components/LayoutHeader.vue
+++ b/core/datacap-ui/src/views/layouts/common/components/LayoutHeader.vue
@@ -28,6 +28,7 @@
                 </template>
 
                 <ShadcnMenuItem v-for="children in item.children"
+                                class="w-full"
                                 :name="children.id"
                                 :active="$route.path === children.url"
                                 :to="children.url">
@@ -38,6 +39,7 @@
                 </ShadcnMenuItem>
               </ShadcnMenuSub>
               <ShadcnMenuItem v-else
+                              class="w-full"
                               :name="item.id"
                               :active="$route.path === item.url"
                               :to="item.url">
@@ -50,16 +52,16 @@
           </ShadcnMenu>
         </ShadcnLayoutHeader>
 
-        <ShadcnSpace>
+        <ShadcnSpace size="large">
           <!-- Language Switcher -->
-          <div class="mr-3 mt-2.5 items-center">
+          <div class="mt-2.5 items-center">
             <ShadcnTooltip :content="$t('common.feedback')">
               <ShadcnLink link="https://github.com/devlive-community/datacap" external target="_blank">
                 <ShadcnIcon icon="CircleHelp" :size="20"/>
               </ShadcnLink>
             </ShadcnTooltip>
           </div>
-          <div class="ml-3 mr-5 mt-1">
+          <div class="mt-1">
             <LanguageSwitcher @changeLanguage="onChangeLanguage($event)"/>
           </div>
           <!-- User Info -->
@@ -74,7 +76,11 @@
           <div v-else>
             <ShadcnDropdown position="right">
               <template #trigger>
-                <ShadcnAvatar :src="userInfo.avatar" :alt="userInfo.username"/>
+                <ShadcnAvatar class="mt-1"
+                              style="width: 2rem;"
+                              :src="userInfo.avatar"
+                              :alt="userInfo.username">
+                </ShadcnAvatar>
               </template>
 
               <ShadcnDropdownItem>
diff --git a/core/datacap-ui/src/views/layouts/profile/LayoutContainer.vue b/core/datacap-ui/src/views/layouts/profile/LayoutContainer.vue
index ca63b5531c..7a0e957bbb 100644
--- a/core/datacap-ui/src/views/layouts/profile/LayoutContainer.vue
+++ b/core/datacap-ui/src/views/layouts/profile/LayoutContainer.vue
@@ -7,7 +7,7 @@
           <ShadcnLayoutSider class="mr-4">
             <LayoutSidebar/>
           </ShadcnLayoutSider>
-          <ShadcnLayoutMain class="ml-2">
+          <ShadcnLayoutMain class="ml-20">
             <ShadcnLayoutContent>
               <RouterView/>
             </ShadcnLayoutContent>
diff --git a/core/datacap-ui/src/views/layouts/profile/components/LayoutSidebar.vue b/core/datacap-ui/src/views/layouts/profile/components/LayoutSidebar.vue
index 70f49ff538..4c033528da 100644
--- a/core/datacap-ui/src/views/layouts/profile/components/LayoutSidebar.vue
+++ b/core/datacap-ui/src/views/layouts/profile/components/LayoutSidebar.vue
@@ -1,6 +1,7 @@
 <template>
   <ShadcnMenu>
     <ShadcnMenuItem v-for="item in items"
+                    class="w-full"
                     :name="item.title"
                     :to="item.href"
                     :active="$route.path === `${item.href}`">
diff --git a/core/datacap-ui/src/views/pages/admin/query/QueryHome.vue b/core/datacap-ui/src/views/pages/admin/query/QueryHome.vue
index 7693c4a4c2..8183ad3ade 100644
--- a/core/datacap-ui/src/views/pages/admin/query/QueryHome.vue
+++ b/core/datacap-ui/src/views/pages/admin/query/QueryHome.vue
@@ -106,7 +106,7 @@
                                       trigger: ['.', '@'],
                                       headers: { 'Authorization': auth?.type + ' ' + auth?.token },
                                       transform: (response: any) => {
-                                        return response.data.columns.map((item: any) => ({
+                                        return response[0].data.columns.map((item: any) => ({
                                           label: item.object_name,
                                           insertText: item.object_name,
                                           detail: item.object_name,