diff --git a/src/layout/components/TabPage/index.vue b/src/layout/components/TabPage/index.vue
index 2f23a9dae..20cb8ec5e 100644
--- a/src/layout/components/TabPage/index.vue
+++ b/src/layout/components/TabPage/index.vue
@@ -6,7 +6,7 @@
 
     <div style="height: 100%">
       <el-tabs
-        v-if="tabIndices.length > 0"
+        v-if="tabIndices.length > 1"
         slot="submenu"
         v-model="iActiveMenu"
         class="page-submenu"
diff --git a/src/router/settings/index.js b/src/router/settings/index.js
index 48a9355c6..8fa2938e5 100644
--- a/src/router/settings/index.js
+++ b/src/router/settings/index.js
@@ -24,7 +24,7 @@ export default {
       name: 'Basic',
       component: () => import('@/views/settings/Basic'),
       meta: {
-        title: i18n.t('Basic'),
+        title: i18n.t('BasicSettings'),
         icon: 'basic',
         permissions: ['settings.view_setting']
       }
@@ -414,7 +414,7 @@ export default {
       path: '/settings/tasks',
       component: empty,
       meta: {
-        title: i18n.t('TaskList'),
+        title: i18n.t('SystemTasks'),
         icon: 'tasks',
         permissions: ['ops.view_celerytask']
       },
@@ -424,7 +424,7 @@ export default {
           name: 'TaskList',
           component: () => import('@/views/settings/Task/index.vue'),
           meta: {
-            title: i18n.t('TaskList'),
+            title: i18n.t('SystemTasks'),
             permissions: ['ops.view_celerytask']
           }
         },
diff --git a/src/views/settings/Auth/Basic.vue b/src/views/settings/Auth/Basic.vue
index 35751c327..3eaf16d7b 100644
--- a/src/views/settings/Auth/Basic.vue
+++ b/src/views/settings/Auth/Basic.vue
@@ -20,7 +20,7 @@ export default {
         [
           this.$t('Basic'),
           [
-            'FORGOT_PASSWORD_URL', 'LOGIN_REDIRECT_MSG_ENABLED'
+            'EMAIL_SUFFIX', 'FORGOT_PASSWORD_URL', 'LOGIN_REDIRECT_MSG_ENABLED'
           ]
         ]
       ],
diff --git a/src/views/settings/Basic/Common.vue b/src/views/settings/Basic/Common.vue
index a63e8e8fd..4a78ab21f 100644
--- a/src/views/settings/Basic/Common.vue
+++ b/src/views/settings/Basic/Common.vue
@@ -24,25 +24,13 @@ export default {
   data() {
     return {
       fields: [
-        [
-          this.$t('BasicInfo'), [
-            'SITE_URL' // 'USER_GUIDE_URL',
-          ]
-        ],
-        [this.$t('NavHelp'), [
-          'HELP_DOCUMENT_URL', 'HELP_SUPPORT_URL'
-        ]]
+        [this.$t('Basic'), ['SITE_URL']], // 'USER_GUIDE_URL',]
+        [this.$t('Navigation'), ['HELP_DOCUMENT_URL', 'HELP_SUPPORT_URL']]
       ],
       fieldsMeta: {
         SITE_URL: {
-          rules: [rules.Required]
-        },
-
-        HELP_DOCUMENT_URL: {
-          helpText: this.$t('HelpDocumentTip')
-        },
-        HELP_SUPPORT_URL: {
-          helpText: this.$t('HelpSupportTip')
+          rules: [rules.Required],
+          helpText: this.$t('SiteURLTip')
         }
       },
       successUrl: { name: 'Basic' },
diff --git a/src/views/settings/Msg/Email/EmailContent.vue b/src/views/settings/Msg/Email/EmailTemplate.vue
similarity index 70%
rename from src/views/settings/Msg/Email/EmailContent.vue
rename to src/views/settings/Msg/Email/EmailTemplate.vue
index a6fbd69e0..408ab66d4 100644
--- a/src/views/settings/Msg/Email/EmailContent.vue
+++ b/src/views/settings/Msg/Email/EmailTemplate.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
-    <el-button size="mini" type="primary" @click="visible = !visible"> {{ $t("Setting") }} </el-button>
+    <el-button size="mini" type="primary" icon="el-icon-setting" @click="visible = !visible"> {{ $t("Settings...") }} </el-button>
     <Dialog
       v-if="visible"
       :show-cancel="false"
       :show-confirm="false"
-      :title="$tc('CreateUserSetting')"
+      :title="$tc('Template')"
       :visible.sync="visible"
       width="70%"
       @confirm="onConfirm()"
@@ -21,7 +21,7 @@ import GenericCreateUpdateForm from '@/layout/components/GenericCreateUpdateForm
 import { Dialog } from '@/components'
 
 export default {
-  name: 'EmailContent',
+  name: 'EmailTemplate',
   components: {
     GenericCreateUpdateForm,
     Dialog
@@ -30,8 +30,12 @@ export default {
     return {
       visible: false,
       fields: [
-        'EMAIL_CUSTOM_USER_CREATED_SUBJECT', 'EMAIL_CUSTOM_USER_CREATED_HONORIFIC',
-        'EMAIL_CUSTOM_USER_CREATED_BODY'
+        [this.$t('General'), ['EMAIL_SUBJECT_PREFIX']],
+        [this.$t('User creation'),
+          [
+            'EMAIL_CUSTOM_USER_CREATED_SUBJECT', 'EMAIL_CUSTOM_USER_CREATED_HONORIFIC', 'EMAIL_CUSTOM_USER_CREATED_BODY'
+          ]
+        ]
       ],
       successUrl: { name: 'Settings', params: { activeMenu: 'EmailContent' }},
       fieldsMeta: {
diff --git a/src/views/settings/Msg/Email/SMTP.vue b/src/views/settings/Msg/Email/SMTP.vue
deleted file mode 100644
index 764d729d3..000000000
--- a/src/views/settings/Msg/Email/SMTP.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<template>
-  <div>
-    <el-button size="mini" type="primary" @click="visible = !visible"> {{ $t("Setting") }} </el-button>
-    <Dialog
-      v-if="visible"
-      :destroy-on-close="true"
-      :show-cancel="false"
-      :show-confirm="false"
-      :title="$tc('SMTP')"
-      :visible.sync="visible"
-      width="70%"
-      @confirm="onConfirm()"
-    >
-      <GenericCreateUpdateForm v-bind="$data" />
-    </Dialog>
-  </div>
-
-</template>
-
-<script>
-import GenericCreateUpdateForm from '@/layout/components/GenericCreateUpdateForm/index.vue'
-import { Dialog } from '@/components'
-import { UpdateToken } from '@/components/Form/FormFields'
-
-export default {
-  name: 'SMTP',
-  components: {
-    GenericCreateUpdateForm,
-    Dialog
-  },
-  data() {
-    return {
-      visible: false,
-      encryptedFields: ['EMAIL_HOST_PASSWORD'],
-      fields: [
-        [
-          this.$t('BasicInfo'),
-          [
-            'EMAIL_PROTOCOL', 'EMAIL_HOST', 'EMAIL_PORT', 'EMAIL_HOST_USER',
-            'EMAIL_HOST_PASSWORD', 'EMAIL_USE_SSL', 'EMAIL_USE_TLS'
-          ]
-        ]
-      ],
-      successUrl: { name: 'Settings', params: { activeMenu: 'EmailContent' }},
-      fieldsMeta: {
-        EMAIL_PORT: {
-          hidden: (formValue) => formValue.EMAIL_PROTOCOL !== 'smtp'
-        },
-        EMAIL_HOST_PASSWORD: {
-          component: UpdateToken
-        },
-        'EMAIL_CUSTOM_USER_CREATED_BODY': {
-          el: {
-            type: 'textarea',
-            rows: 3
-          }
-        },
-        EMAIL_USE_SSL: {
-          hidden: (formValue) => formValue.EMAIL_PROTOCOL !== 'smtp'
-        },
-        EMAIL_USE_TLS: {
-          hidden: (formValue) => formValue.EMAIL_PROTOCOL !== 'smtp'
-        }
-      },
-      url: '/api/v1/settings/setting/?category=email',
-      submitMethod() {
-        return 'patch'
-      },
-      onConfirm() {
-      },
-      cleanFormValue(data) {
-        if (!data['EMAIL_HOST_PASSWORD']) {
-          delete data['EMAIL_HOST_PASSWORD']
-        }
-        if (data['EMAIL_USE_SSL'] === null) {
-          delete data['EMAIL_USE_SSL']
-        }
-        if (data['EMAIL_USE_TLS'] === null) {
-          delete data['EMAIL_USE_TLS']
-        }
-        if (data['EMAIL_PORT'] === null) {
-          delete data['EMAIL_PORT']
-        }
-        return data
-      }
-    }
-  },
-  methods: {}
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/settings/Msg/Email/index.vue b/src/views/settings/Msg/Email/index.vue
index a6d9c328a..91818774e 100644
--- a/src/views/settings/Msg/Email/index.vue
+++ b/src/views/settings/Msg/Email/index.vue
@@ -6,15 +6,14 @@
       v-bind="$data"
     />
   </IBox>
-
 </template>
 
 <script>
 import { IBox } from '@/components'
 import { GenericCreateUpdateForm } from '@/layout/components'
 import { testEmailSetting } from '@/api/settings'
-import EmailContent from './EmailContent.vue'
-import SMTP from './SMTP.vue'
+import EmailTemplate from './EmailTemplate.vue'
+import { UpdateToken } from '@/components/Form/FormFields'
 import rules from '@/components/Form/DataForm/rules'
 
 export default {
@@ -26,39 +25,41 @@ export default {
   data() {
     const vm = this
     return {
+      encryptedFields: ['EMAIL_HOST_PASSWORD'],
       fields: [
-        [
-          this.$t('Server'),
-          [
-            'SMTP'
-          ]
-        ],
-        [
-          this.$t('MailSend'),
-          [
-            'EMAIL_FROM', 'EMAIL_SUBJECT_PREFIX'
-          ]
-        ],
-        [
-          this.$t('EmailContent'),
-          [
-            'CREATE_USER_MSG'
-          ]
-        ],
-        [
-          this.$t('Other'),
-          [
-            'EMAIL_RECIPIENT', 'EMAIL_SUFFIX'
-          ]
+        [this.$t('Server'), [
+          'EMAIL_PROTOCOL',
+          'EMAIL_HOST',
+          'EMAIL_PORT',
+          'EMAIL_HOST_USER',
+          'EMAIL_HOST_PASSWORD',
+          'EMAIL_FROM',
+          'EMAIL_USE_SSL',
+          'EMAIL_USE_TLS'
         ]
+        ],
+        [this.$t('Other'), ['CREATE_USER_MSG']],
+        [this.$t('Test'), ['EMAIL_RECIPIENT']]
       ],
       fieldsMeta: {
+        EMAIL_PORT: {
+          hidden: (formValue) => formValue.EMAIL_PROTOCOL !== 'smtp'
+        },
+        EMAIL_HOST_PASSWORD: {
+          component: UpdateToken
+        },
         EMAIL_HOST_USER: {
           rules: [
             rules.EmailCheck,
             rules.Required
           ]
         },
+        EMAIL_CUSTOM_USER_CREATED_BODY: {
+          el: {
+            type: 'textarea',
+            rows: 3
+          }
+        },
         EMAIL_FROM: {
           rules: [
             rules.EmailCheck
@@ -69,13 +70,16 @@ export default {
             rules.EmailCheck
           ]
         },
-        CREATE_USER_MSG: {
-          label: this.$t('CreateUserSetting'),
-          component: EmailContent
+        EMAIL_USE_SSL: {
+          hidden: (formValue) => formValue.EMAIL_PROTOCOL !== 'smtp'
         },
-        SMTP: {
-          label: this.$t('SMTP'),
-          component: SMTP
+        EMAIL_USE_TLS: {
+          hidden: (formValue) => formValue.EMAIL_PROTOCOL !== 'smtp'
+        },
+        CREATE_USER_MSG: {
+          label: this.$t('EmailTemplate'),
+          component: EmailTemplate,
+          helpTip: this.$t('EmailTemplateHelpTip')
         }
       },
       hasDetailInMsg: false,
@@ -104,6 +108,9 @@ export default {
             if (data[key] === null) {
               delete data[key]
             }
+            if (!data['EMAIL_HOST_PASSWORD']) {
+              delete data['EMAIL_HOST_PASSWORD']
+            }
           }
         )
         return data
diff --git a/src/views/settings/Msg/SMS/Base.vue b/src/views/settings/Msg/SMS/Base.vue
index 6ac481ab5..f4ba12fd9 100644
--- a/src/views/settings/Msg/SMS/Base.vue
+++ b/src/views/settings/Msg/SMS/Base.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" type="primary" @click="visible=true">{{ $t('Setting') }}</el-button>
+    <el-button size="mini" type="primary" icon="el-icon-setting" @click="visible=true">{{ $t('Settings...') }}</el-button>
     <Dialog
       v-if="visible"
       :destroy-on-close="true"
diff --git a/src/views/settings/Msg/SMS/CMPP2.vue b/src/views/settings/Msg/SMS/CMPP2.vue
index f3a63416d..9400c89f3 100644
--- a/src/views/settings/Msg/SMS/CMPP2.vue
+++ b/src/views/settings/Msg/SMS/CMPP2.vue
@@ -39,14 +39,14 @@ export default {
       ],
       fields: [
         [
-          this.$t('BasicInfo'),
+          this.$t('Basic'),
           [
             'CMPP2_HOST', 'CMPP2_PORT', 'CMPP2_SP_ID', 'CMPP2_SP_SECRET', 'CMPP2_SRC_ID', 'CMPP2_SERVICE_ID',
             'CMPP2_VERIFY_SIGN_NAME', 'CMPP2_VERIFY_TEMPLATE_CODE'
           ]
         ],
         [
-          this.$t('Other'),
+          this.$t('Test'),
           [
             'SMS_TEST_PHONE'
           ]
diff --git a/src/views/settings/Msg/SMS/SMSAlibaba.vue b/src/views/settings/Msg/SMS/SMSAlibaba.vue
index 9919aa252..084b0e4db 100644
--- a/src/views/settings/Msg/SMS/SMSAlibaba.vue
+++ b/src/views/settings/Msg/SMS/SMSAlibaba.vue
@@ -37,19 +37,19 @@ export default {
       ],
       fields: [
         [
-          this.$t('BasicInfo'),
+          this.$t('Basic'),
           [
             'ALIBABA_ACCESS_KEY_ID', 'ALIBABA_ACCESS_KEY_SECRET'
           ]
         ],
         [
-          this.$t('VerifySignTmpl'),
+          this.$t('Template'),
           [
             'ALIBABA_VERIFY_SIGN_NAME', 'ALIBABA_VERIFY_TEMPLATE_CODE'
           ]
         ],
         [
-          this.$t('Other'),
+          this.$t('Test'),
           [
             'SMS_TEST_PHONE'
           ]
diff --git a/src/views/settings/Msg/SMS/SMSCustom.vue b/src/views/settings/Msg/SMS/SMSCustom.vue
index 9c64369d9..9cf6b90e0 100644
--- a/src/views/settings/Msg/SMS/SMSCustom.vue
+++ b/src/views/settings/Msg/SMS/SMSCustom.vue
@@ -37,13 +37,13 @@ export default {
       ],
       fields: [
         [
-          this.$t('BasicInfo'),
+          this.$t('Basic'),
           [
             'CUSTOM_SMS_URL', 'CUSTOM_SMS_REQUEST_METHOD', 'CUSTOM_SMS_API_PARAMS'
           ]
         ],
         [
-          this.$t('Other'),
+          this.$t('Test'),
           [
             'SMS_TEST_PHONE'
           ]
diff --git a/src/views/settings/Msg/SMS/SMSFileCustom.vue b/src/views/settings/Msg/SMS/SMSFileCustom.vue
index 34a76ba40..ad8d1e4fc 100644
--- a/src/views/settings/Msg/SMS/SMSFileCustom.vue
+++ b/src/views/settings/Msg/SMS/SMSFileCustom.vue
@@ -41,7 +41,7 @@ export default {
       ],
       fields: [
         [
-          this.$t('Other'),
+          this.$t('Test'),
           [
             'SMS_TEST_PHONE'
           ]
diff --git a/src/views/settings/Msg/SMS/SMSHuawei.vue b/src/views/settings/Msg/SMS/SMSHuawei.vue
index f0061ed7d..3c03e8a43 100644
--- a/src/views/settings/Msg/SMS/SMSHuawei.vue
+++ b/src/views/settings/Msg/SMS/SMSHuawei.vue
@@ -39,19 +39,19 @@ export default {
       ],
       fields: [
         [
-          this.$t('BasicInfo'),
+          this.$t('Basic'),
           [
             'HUAWEI_APP_KEY', 'HUAWEI_APP_SECRET', 'HUAWEI_SMS_ENDPOINT'
           ]
         ],
         [
-          this.$t('VerifySignTmpl'),
+          this.$t('Template'),
           [
             'HUAWEI_SIGN_CHANNEL_NUM', 'HUAWEI_VERIFY_SIGN_NAME', 'HUAWEI_VERIFY_TEMPLATE_CODE'
           ]
         ],
         [
-          this.$t('Other'),
+          this.$t('Test'),
           [
             'SMS_TEST_PHONE'
           ]
diff --git a/src/views/settings/Msg/SMS/SMSTencent.vue b/src/views/settings/Msg/SMS/SMSTencent.vue
index ab1c2ee3c..36d97e6e8 100644
--- a/src/views/settings/Msg/SMS/SMSTencent.vue
+++ b/src/views/settings/Msg/SMS/SMSTencent.vue
@@ -37,19 +37,19 @@ export default {
       ],
       fields: [
         [
-          this.$t('BasicInfo'),
+          this.$t('Basic'),
           [
             'TENCENT_SECRET_ID', 'TENCENT_SECRET_KEY', 'TENCENT_SDKAPPID'
           ]
         ],
         [
-          this.$t('VerifySignTmpl'),
+          this.$t('Template'),
           [
             'TENCENT_VERIFY_SIGN_NAME', 'TENCENT_VERIFY_TEMPLATE_CODE'
           ]
         ],
         [
-          this.$t('Other'),
+          this.$t('Test'),
           [
             'SMS_TEST_PHONE'
           ]
diff --git a/src/views/settings/Msg/SMS/index.vue b/src/views/settings/Msg/SMS/index.vue
index 1ceee0d11..e1690a47a 100644
--- a/src/views/settings/Msg/SMS/index.vue
+++ b/src/views/settings/Msg/SMS/index.vue
@@ -30,7 +30,7 @@ export default {
           ]
         ],
         [
-          this.$t('SMSProvider'), [
+          this.$t('Provider'), [
             'ALIYUN', 'QCLOUD', 'HUAWEICLOUD', 'CMPP2', 'SMSCustom', 'SMSFileCustom'
           ]
         ]
diff --git a/src/views/settings/Msg/Subscribe/index.vue b/src/views/settings/Msg/Subscribe/index.vue
index 561da5d26..72e6157ad 100644
--- a/src/views/settings/Msg/Subscribe/index.vue
+++ b/src/views/settings/Msg/Subscribe/index.vue
@@ -36,7 +36,7 @@
         <el-table-column :label="$tc('Actions')" width="200">
           <template v-slot="scope">
             <el-button v-if="!scope.row.children" type="small" @click="onOpenDialog(scope.row)">
-              {{ $t('ChangeReceiver') }}
+              {{ $t('EditRecipient') }}
             </el-button>
           </template>
         </el-table-column>
@@ -45,7 +45,7 @@
       <SelectDialog
         v-if="dialogVisible"
         :selected-users="dialogSelectedUsers"
-        :title="$tc('ChangeReceiver')"
+        :title="$tc('EditRecipient')"
         :visible.sync="dialogVisible"
         @cancel="dialogVisible=false"
         @submit="onDialogSelectSubmit"
diff --git a/src/views/settings/Org/OrganizationList.vue b/src/views/settings/Org/OrganizationList.vue
index 41d490ac9..bc5e2a748 100644
--- a/src/views/settings/Org/OrganizationList.vue
+++ b/src/views/settings/Org/OrganizationList.vue
@@ -3,7 +3,7 @@
     <GenericListPage :header-actions="headerActions" :table-config="tableConfig" />
     <Dialog
       :show-buttons="false"
-      :title="$tc('Setting')"
+      :title="$tc('General')"
       :visible.sync="visible"
     >
       <GenericCreateUpdateForm v-bind="form" @submitSuccess="visible=false" />
@@ -110,7 +110,7 @@ export default {
         canCreate: this.$hasPerm('orgs.add_organization'),
         extraActions: [
           {
-            title: this.$t('Setting'),
+            title: this.$t('Settings...'),
             icon: 'el-icon-setting',
             callback: () => {
               this.visible = true