diff --git a/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue b/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue
index 2fdbfabed..25c5b2350 100755
--- a/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue
+++ b/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue
@@ -1,6 +1,7 @@
 <template>
   <el-form-item
     v-show="_show"
+    :class="'el-form-item-' + data.prop"
     :label="data.label"
     :prop="prop"
     :rules="_show && Array.isArray(data.rules) ? data.rules : []"
diff --git a/src/components/Table/ListTable/TableAction/LeftSide.vue b/src/components/Table/ListTable/TableAction/LeftSide.vue
index 98c6fa519..11f69a281 100644
--- a/src/components/Table/ListTable/TableAction/LeftSide.vue
+++ b/src/components/Table/ListTable/TableAction/LeftSide.vue
@@ -126,6 +126,7 @@ export default {
           type: 'primary',
           has: this.hasCreate && !this.moreCreates,
           can: this.canCreate,
+          icon: 'plus',
           callback: this.onCreate || this.handleCreate
         }
       ]
diff --git a/src/components/Table/TableFormatters/DeleteActionFormatter.vue b/src/components/Table/TableFormatters/DeleteActionFormatter.vue
index f7dc5864d..e598a53af 100644
--- a/src/components/Table/TableFormatters/DeleteActionFormatter.vue
+++ b/src/components/Table/TableFormatters/DeleteActionFormatter.vue
@@ -2,6 +2,7 @@
   <el-button
     ref="deleteButton"
     :disabled="iDisabled"
+    :title="$t('Remove')"
     size="mini"
     type="danger"
     @click="onDelete(col, row, cellValue, reload)"
diff --git a/src/icons/svg/plus.svg b/src/icons/svg/plus.svg
new file mode 100644
index 000000000..92e9b8df3
--- /dev/null
+++ b/src/icons/svg/plus.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="24" height="24" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M24.0605 10L24.0239 38" stroke="#ffffff" stroke-width="4" stroke-linecap="square" stroke-linejoin="bevel"/><path d="M10 24L38 24" stroke="#ffffff" stroke-width="4" stroke-linecap="square" stroke-linejoin="bevel"/></svg>
diff --git a/src/layout/components/GenericDetailPage/index.vue b/src/layout/components/GenericDetailPage/index.vue
index cebf330af..589773a56 100644
--- a/src/layout/components/GenericDetailPage/index.vue
+++ b/src/layout/components/GenericDetailPage/index.vue
@@ -8,7 +8,7 @@
   >
     <template #headingRightSide>
       <span v-if="hasRightSide">
-        <ActionsGroup slot="headingRightSide" :actions="pageActions" />
+        <ActionsGroup slot="headingRightSide" :actions="pageActions" class="header-buttons" />
       </span>
     </template>
     <slot />
@@ -137,6 +137,7 @@ export default {
           name: 'update',
           title: this.$t('Update'),
           icon: 'el-icon-edit-outline',
+          size: 'small',
           can: this.validActions.canUpdate,
           has: this.validActions.hasUpdate,
           callback: this.validActions.updateCallback.bind(this)
@@ -147,6 +148,7 @@ export default {
           type: 'danger',
           plain: true,
           icon: 'el-icon-delete',
+          size: 'small',
           can: this.validActions.canDelete,
           has: this.validActions.hasDelete,
           callback: this.validActions.deleteCallback.bind(this)
@@ -258,18 +260,7 @@ export default {
 </script>
 
 <style scoped>
-  .page-submenu >>> .el-tabs__header {
-    background-color: white;
-    margin-left: -25px;
-    padding-left: 25px;
-    margin-right: -25px;
-    padding-right: 25px;
-    margin-top: -30px;
-    /*margin: 0;*/
-    /*background-color: #f3f3f4;*/
-  }
-
-  .page-submenu >>> .el-tabs__nav-wrap {
-    position: static;
+  .header-buttons {
+    z-index: 999;
   }
 </style>
diff --git a/src/layout/components/NavHeader/Organization.vue b/src/layout/components/NavHeader/Organization.vue
index 147f9aaf5..8db22e00c 100644
--- a/src/layout/components/NavHeader/Organization.vue
+++ b/src/layout/components/NavHeader/Organization.vue
@@ -10,7 +10,6 @@
   >
     <template slot="prefix">
       <svg-icon icon-class="organization" />
-      <span class="line" />
     </template>
 
     <el-option-group
@@ -78,7 +77,7 @@ export default {
             id: 'list',
             icon: 'list',
             disabled: !this.$hasPerm('orgs.view_organization'),
-            name: this.$t('OrganizationLists')
+            name: this.$t('OrganizationManage')
           }
         ]
       }
@@ -88,7 +87,7 @@ export default {
     },
     orgChoicesGroup() {
       return {
-        label: this.$t('AllOrganization'),
+        label: this.$t('ChangeOrganization'),
         options: this.usingOrgs
       }
     },
@@ -154,7 +153,7 @@ $height: 28px;
 
 .line {
   width: 1px;
-  margin-left: 8px;
+  margin-left: 5px;
   border: .5px solid #FFF;
   opacity: 0.4;
 }
diff --git a/src/layout/components/Page/PageContent.vue b/src/layout/components/Page/PageContent.vue
index 5dfbd7d30..7612be29a 100644
--- a/src/layout/components/Page/PageContent.vue
+++ b/src/layout/components/Page/PageContent.vue
@@ -12,8 +12,7 @@ export default {
 
 <style scoped>
   .wrapper-content {
-    padding: 12px 24px 22px;
-    max-width: 1200px;
+    padding: 12px 30px 22px;
   }
 
   .wrapper-content >>> .el-alert {
diff --git a/src/layout/components/TabPage/index.vue b/src/layout/components/TabPage/index.vue
index 04ae7ec22..de49bb2bc 100644
--- a/src/layout/components/TabPage/index.vue
+++ b/src/layout/components/TabPage/index.vue
@@ -157,7 +157,7 @@ export default {
   padding-left: 25px;
   margin-right: -25px;
   padding-right: 25px;
-  margin-top: -30px;
+  margin-top: -23px;
   width: 100vw;
 
   .el-tabs__item {
diff --git a/src/styles/index.scss b/src/styles/index.scss
index f913c901d..0da87527a 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -383,3 +383,6 @@ button, input, optgroup, select, textarea {
     line-height: 1.5;
   }
 }
+.form-group-header {
+  text-align: left;
+}
diff --git a/src/views/users/Group/UserGroupDetail/GroupUser.vue b/src/views/users/Group/UserGroupDetail/GroupUser.vue
index 979eab4e0..210d6da18 100644
--- a/src/views/users/Group/UserGroupDetail/GroupUser.vue
+++ b/src/views/users/Group/UserGroupDetail/GroupUser.vue
@@ -68,7 +68,7 @@ export default {
       tableConfig: {
         url: `/api/v1/users/users/?group_id=${this.object.id}`,
         columns: [
-          'name', 'username', 'email', 'is_valid', 'delete_action'
+          'name', 'username', 'is_valid', 'delete_action'
         ],
         columnsMeta: {
           name: {
diff --git a/src/views/users/User/UserCreateUpdate.vue b/src/views/users/User/UserCreateUpdate.vue
index 20cd8d2c8..a3ee9219b 100644
--- a/src/views/users/User/UserCreateUpdate.vue
+++ b/src/views/users/User/UserCreateUpdate.vue
@@ -1,5 +1,5 @@
 <template>
-  <GenericCreateUpdatePage v-if="!loading" v-bind="$data" @getObjectDone="afterGetUser" />
+  <GenericCreateUpdatePage v-if="!loading" class="user-create-update" v-bind="$data" @getObjectDone="afterGetUser" />
 </template>
 
 <script>
@@ -25,7 +25,7 @@ export default {
         'can_public_key_auth': false
       },
       fields: [
-        [this.$t('Account'), ['name', 'username', 'email', 'groups']],
+        [this.$t('Basic'), ['name', 'username', 'email', 'groups']],
         [this.$t('Authentication'), [
           'password_strategy', 'update_password', 'password',
           'need_update_password', 'mfa_level', 'source'
@@ -219,5 +219,13 @@ export default {
 }
 </script>
 
-<style lang="less" scoped>
+<style lang="scss" scoped>
+.user-create-update >>> .el-form-item-need_update_password {
+  margin-top: -10px;
+
+  .el-form-item__content label {
+    line-height: 30px;
+  }
+}
+
 </style>