diff --git a/core/core-frontend/src/assets/svg/icon_organization_outlined.svg b/core/core-frontend/src/assets/svg/icon_organization_outlined.svg
index b418ddbe3d..38e011d0fb 100644
--- a/core/core-frontend/src/assets/svg/icon_organization_outlined.svg
+++ b/core/core-frontend/src/assets/svg/icon_organization_outlined.svg
@@ -1,3 +1,3 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.30394 16.5H17.6959C17.9459 16.35 18.2149 16.23 18.4999 16.145V14.5C18.4999 14.2348 18.3946 13.9804 18.207 13.7929C18.0195 13.6054 17.7652 13.5 17.4999 13.5H6.49994C6.23472 13.5 5.98037 13.6054 5.79283 13.7929C5.6053 13.9804 5.49994 14.2348 5.49994 14.5V16.145C5.78494 16.23 6.05444 16.35 6.30394 16.5ZM3.49994 16.145V14.5C3.49994 13.7044 3.81601 12.9413 4.37862 12.3787C4.94123 11.8161 5.70429 11.5 6.49994 11.5H10.9999V9.37402C10.0573 9.13063 9.23575 8.55179 8.68934 7.74601C8.14292 6.94023 7.90915 5.96283 8.03182 4.99702C8.15449 4.03121 8.6252 3.14329 9.35571 2.4997C10.0862 1.85611 11.0264 1.50104 11.9999 1.50104C12.9735 1.50104 13.9137 1.85611 14.6442 2.4997C15.3747 3.14329 15.8454 4.03121 15.9681 4.99702C16.0907 5.96283 15.857 6.94023 15.3105 7.74601C14.7641 8.55179 13.9426 9.13063 12.9999 9.37402V11.5H17.4999C18.2956 11.5 19.0586 11.8161 19.6213 12.3787C20.1839 12.9413 20.4999 13.7044 20.4999 14.5V16.145C21.2693 16.3744 21.9365 16.8613 22.3896 17.5241C22.8426 18.1869 23.0541 18.9853 22.9884 19.7854C22.9227 20.5856 22.584 21.3389 22.0289 21.9189C21.4738 22.499 20.7362 22.8706 19.9397 22.9715C19.1432 23.0723 18.3363 22.8962 17.6542 22.4728C16.9721 22.0494 16.4563 21.4043 16.1932 20.6457C15.9302 19.8872 15.936 19.0613 16.2096 18.3065C16.4832 17.5517 17.008 16.9139 17.6959 16.5H6.30394C6.99191 16.9139 7.51668 17.5517 7.79027 18.3065C8.06386 19.0613 8.06964 19.8872 7.80663 20.6457C7.54362 21.4043 7.02782 22.0494 6.34571 22.4728C5.6636 22.8962 4.85665 23.0723 4.06015 22.9715C3.26366 22.8706 2.52604 22.499 1.97098 21.9189C1.41592 21.3389 1.07715 20.5856 1.01149 19.7854C0.945821 18.9853 1.15725 18.1869 1.61031 17.5241C2.06338 16.8613 2.73054 16.3744 3.49994 16.145ZM11.9999 7.50002C12.5304 7.50002 13.0391 7.28931 13.4142 6.91423C13.7892 6.53916 13.9999 6.03045 13.9999 5.50002C13.9999 4.96959 13.7892 4.46088 13.4142 4.08581C13.0391 3.71073 12.5304 3.50002 11.9999 3.50002C11.4695 3.50002 10.9608 3.71073 10.5857 4.08581C10.2107 4.46088 9.99994 4.96959 9.99994 5.50002C9.99994 6.03045 10.2107 6.53916 10.5857 6.91423C10.9608 7.28931 11.4695 7.50002 11.9999 7.50002V7.50002ZM19.4999 21C19.8978 21 20.2793 20.842 20.5606 20.5607C20.8419 20.2794 20.9999 19.8978 20.9999 19.5C20.9999 19.1022 20.8419 18.7207 20.5606 18.4394C20.2793 18.1581 19.8978 18 19.4999 18C19.1021 18 18.7206 18.1581 18.4393 18.4394C18.158 18.7207 17.9999 19.1022 17.9999 19.5C17.9999 19.8978 18.158 20.2794 18.4393 20.5607C18.7206 20.842 19.1021 21 19.4999 21V21ZM4.49994 21C4.89776 21 5.2793 20.842 5.5606 20.5607C5.8419 20.2794 5.99994 19.8978 5.99994 19.5C5.99994 19.1022 5.8419 18.7207 5.5606 18.4394C5.2793 18.1581 4.89776 18 4.49994 18C4.10212 18 3.72058 18.1581 3.43928 18.4394C3.15798 18.7207 2.99994 19.1022 2.99994 19.5C2.99994 19.8978 3.15798 20.2794 3.43928 20.5607C3.72058 20.842 4.10212 21 4.49994 21V21Z" fill="#1F2329"/>
+<svg width="24" height="24" viewBox="0 0 24 24"  xmlns="http://www.w3.org/2000/svg">
+<path d="M6.30394 16.5H17.6959C17.9459 16.35 18.2149 16.23 18.4999 16.145V14.5C18.4999 14.2348 18.3946 13.9804 18.207 13.7929C18.0195 13.6054 17.7652 13.5 17.4999 13.5H6.49994C6.23472 13.5 5.98037 13.6054 5.79283 13.7929C5.6053 13.9804 5.49994 14.2348 5.49994 14.5V16.145C5.78494 16.23 6.05444 16.35 6.30394 16.5ZM3.49994 16.145V14.5C3.49994 13.7044 3.81601 12.9413 4.37862 12.3787C4.94123 11.8161 5.70429 11.5 6.49994 11.5H10.9999V9.37402C10.0573 9.13063 9.23575 8.55179 8.68934 7.74601C8.14292 6.94023 7.90915 5.96283 8.03182 4.99702C8.15449 4.03121 8.6252 3.14329 9.35571 2.4997C10.0862 1.85611 11.0264 1.50104 11.9999 1.50104C12.9735 1.50104 13.9137 1.85611 14.6442 2.4997C15.3747 3.14329 15.8454 4.03121 15.9681 4.99702C16.0907 5.96283 15.857 6.94023 15.3105 7.74601C14.7641 8.55179 13.9426 9.13063 12.9999 9.37402V11.5H17.4999C18.2956 11.5 19.0586 11.8161 19.6213 12.3787C20.1839 12.9413 20.4999 13.7044 20.4999 14.5V16.145C21.2693 16.3744 21.9365 16.8613 22.3896 17.5241C22.8426 18.1869 23.0541 18.9853 22.9884 19.7854C22.9227 20.5856 22.584 21.3389 22.0289 21.9189C21.4738 22.499 20.7362 22.8706 19.9397 22.9715C19.1432 23.0723 18.3363 22.8962 17.6542 22.4728C16.9721 22.0494 16.4563 21.4043 16.1932 20.6457C15.9302 19.8872 15.936 19.0613 16.2096 18.3065C16.4832 17.5517 17.008 16.9139 17.6959 16.5H6.30394C6.99191 16.9139 7.51668 17.5517 7.79027 18.3065C8.06386 19.0613 8.06964 19.8872 7.80663 20.6457C7.54362 21.4043 7.02782 22.0494 6.34571 22.4728C5.6636 22.8962 4.85665 23.0723 4.06015 22.9715C3.26366 22.8706 2.52604 22.499 1.97098 21.9189C1.41592 21.3389 1.07715 20.5856 1.01149 19.7854C0.945821 18.9853 1.15725 18.1869 1.61031 17.5241C2.06338 16.8613 2.73054 16.3744 3.49994 16.145ZM11.9999 7.50002C12.5304 7.50002 13.0391 7.28931 13.4142 6.91423C13.7892 6.53916 13.9999 6.03045 13.9999 5.50002C13.9999 4.96959 13.7892 4.46088 13.4142 4.08581C13.0391 3.71073 12.5304 3.50002 11.9999 3.50002C11.4695 3.50002 10.9608 3.71073 10.5857 4.08581C10.2107 4.46088 9.99994 4.96959 9.99994 5.50002C9.99994 6.03045 10.2107 6.53916 10.5857 6.91423C10.9608 7.28931 11.4695 7.50002 11.9999 7.50002V7.50002ZM19.4999 21C19.8978 21 20.2793 20.842 20.5606 20.5607C20.8419 20.2794 20.9999 19.8978 20.9999 19.5C20.9999 19.1022 20.8419 18.7207 20.5606 18.4394C20.2793 18.1581 19.8978 18 19.4999 18C19.1021 18 18.7206 18.1581 18.4393 18.4394C18.158 18.7207 17.9999 19.1022 17.9999 19.5C17.9999 19.8978 18.158 20.2794 18.4393 20.5607C18.7206 20.842 19.1021 21 19.4999 21V21ZM4.49994 21C4.89776 21 5.2793 20.842 5.5606 20.5607C5.8419 20.2794 5.99994 19.8978 5.99994 19.5C5.99994 19.1022 5.8419 18.7207 5.5606 18.4394C5.2793 18.1581 4.89776 18 4.49994 18C4.10212 18 3.72058 18.1581 3.43928 18.4394C3.15798 18.7207 2.99994 19.1022 2.99994 19.5C2.99994 19.8978 3.15798 20.2794 3.43928 20.5607C3.72058 20.842 4.10212 21 4.49994 21V21Z" />
 </svg>
diff --git a/core/core-frontend/src/custom-component/v-query/CustomSortFilter.vue b/core/core-frontend/src/custom-component/v-query/CustomSortFilter.vue
index 9624b4cd74..c5693c3d98 100644
--- a/core/core-frontend/src/custom-component/v-query/CustomSortFilter.vue
+++ b/core/core-frontend/src/custom-component/v-query/CustomSortFilter.vue
@@ -7,7 +7,7 @@
     class="custom-sort_filter"
     width="300px"
   >
-    <div style="max-height: 400px; overflow-y: auto">
+    <div>
       <draggable :list="sortList" animation="300" class="drag-list">
         <template #item="{ element }">
           <span :key="element.name" class="item-dimension" :title="element">
@@ -64,7 +64,7 @@ defineExpose({
 .custom-sort_filter {
   .drag-list {
     overflow: auto;
-    max-height: 800px;
+    max-height: 400px;
     .item-dimension {
       padding: 2px;
       margin: 2px;
diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index eadee77911..a74e29b52c 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -3491,7 +3491,7 @@ defineExpose({
             }
           }
           .label {
-            width: 100px;
+            width: 80px;
             color: #1f2329;
           }
 
diff --git a/core/core-frontend/src/layout/components/Header.vue b/core/core-frontend/src/layout/components/Header.vue
index 6dae89860c..5746ad8fb4 100644
--- a/core/core-frontend/src/layout/components/Header.vue
+++ b/core/core-frontend/src/layout/components/Header.vue
@@ -120,7 +120,7 @@ const copilotConfirm = () => {
   wsCache.set('DE-COPILOT-TIPS-CHECK', 'CHECKED')
   showOverlayCopilot.value = false
 }
-const badgeCount = ref(0)
+const badgeCount = ref('0')
 
 onMounted(() => {
   initShowSystem()
@@ -129,7 +129,7 @@ onMounted(() => {
   initCopilotBase()
 
   msgCountApi().then(res => {
-    badgeCount.value = res?.data || 0
+    badgeCount.value = (res?.data > 99 ? '99+' : res?.data) || '0'
   })
 })
 </script>
@@ -190,10 +190,14 @@ onMounted(() => {
       <ToolboxCfg v-if="showToolbox" />
       <TopDoc v-if="appearanceStore.getShowDoc" />
       <el-tooltip effect="dark" :content="$t('v_query.msg_center')" placement="bottom">
-        <el-badge :hidden="badgeCount === 0" :value="badgeCount" class="item">
+        <el-badge
+          style="margin-right: 10px"
+          :hidden="[0, '0'].includes(badgeCount)"
+          :value="badgeCount"
+          class="ed-badge_custom"
+        >
           <el-icon
             class="preview-download_icon"
-            style="margin-right: 10px"
             :class="navigateBg === 'light' && 'is-light-setting'"
           >
             <Icon name="dv-preview-download"
@@ -219,6 +223,16 @@ onMounted(() => {
 </template>
 
 <style lang="less" scoped>
+:deep(.ed-badge_custom) {
+  --ed-badge-size: 14px;
+  .ed-badge__content {
+    right: 0;
+    padding: 3px;
+    border: none;
+    font-size: 8px;
+    transform: translateX(20%) translateY(-30%);
+  }
+}
 .preview-download_icon {
   padding: 5px;
   height: 28px;
diff --git a/core/core-frontend/src/layout/components/SystemCfg.vue b/core/core-frontend/src/layout/components/SystemCfg.vue
index 0fb1e58fff..e75f065ac3 100644
--- a/core/core-frontend/src/layout/components/SystemCfg.vue
+++ b/core/core-frontend/src/layout/components/SystemCfg.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import iconSetting from '@/assets/svg/icon-setting.svg'
+import iconSetting from '@/assets/svg/icon_organization_outlined.svg'
 import { useRouter } from 'vue-router'
 import { useAppearanceStoreWithOut } from '@/store/modules/appearance'
 import { computed } from 'vue'
diff --git a/core/core-frontend/src/layout/index.vue b/core/core-frontend/src/layout/index.vue
index f78997135a..a1f09d5f60 100644
--- a/core/core-frontend/src/layout/index.vue
+++ b/core/core-frontend/src/layout/index.vue
@@ -48,7 +48,9 @@ const { t } = useI18n()
           >
             {{ msgFillMenu ? t('v_query.msg_center') : t('toolbox.org_center') }}
           </div>
-          <Menu :style="{ height: systemMenu ? 'calc(100% - 48px)' : '100%' }"></Menu>
+          <Menu
+            :style="{ height: systemMenu || msgFillMenu ? 'calc(100% - 48px)' : '100%' }"
+          ></Menu>
         </Sidebar>
         <el-aside class="layout-sidebar layout-sidebar-collapse" v-else>
           <Menu
diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts
index 1da03f8775..57f12cf166 100644
--- a/core/core-frontend/src/locales/en.ts
+++ b/core/core-frontend/src/locales/en.ts
@@ -148,7 +148,7 @@ export default {
     relevant_templates_found: 'No relevant templates found',
     last_edited_by: 'Last editor',
     last_edit_time: 'Last edit time',
-    big_data_screen: 'Big data screen',
+    big_data_screen: 'Data screen',
     big_screen: 'Big screen',
     dashboard: 'Dashboard',
     data_set: 'Data set',
diff --git a/core/core-frontend/src/views/about/index.vue b/core/core-frontend/src/views/about/index.vue
index 5dbb227509..0c90791548 100644
--- a/core/core-frontend/src/views/about/index.vue
+++ b/core/core-frontend/src/views/about/index.vue
@@ -193,7 +193,7 @@ const syncFree = () => {
 <template>
   <el-dialog
     :append-to-body="true"
-    title="关于"
+    :title="t('common.about')"
     width="840px"
     v-model="dialogVisible"
     class="about-dialog"