diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 77a5b5f23..78d2cfeff 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -70,9 +70,14 @@ export default {
   line-height: 50px;
   margin-left: 8px;
 
+  span >>> a:hover {
+    color: inherit;
+  }
+
   .no-redirect {
-    color: #97a8be;
+    /*color: #97a8be;*/
     cursor: text;
+    font-weight: 600;
   }
 }
 </style>
diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index f2a311e86..08b3b9820 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -18,7 +18,9 @@ const cn = {
     'name': '名称',
     'action': '动作',
     'role': '角色',
-    'username': '用户名'
+    'username': '用户名',
+    'Language': '语言',
+    'Help': '帮助'
   },
   route: {
     'dashboard': '仪表盘',
diff --git a/src/layout/components/NavBar/Organization.vue b/src/layout/components/NavBar/Organization.vue
index 9ccd86cf2..59b3063cc 100644
--- a/src/layout/components/NavBar/Organization.vue
+++ b/src/layout/components/NavBar/Organization.vue
@@ -1,15 +1,16 @@
 <template>
   <transition name="sidebarLogoFade">
     <el-select
-      class="org-didi"
       v-if="!isCollapse && userAdminOrgList.length>1"
+      class="org-didi"
       :value="currentOrg.id"
       filterable
       placeholder="请选择"
-      @change="changeOrg">
+      @change="changeOrg"
+    >
 
       <template slot="prefix">
-        <i class="fa fa-bookmark"></i>
+        <i class="fa fa-bookmark" />
       </template>
 
       <el-option
@@ -17,8 +18,8 @@
         :key="item.id"
         selected="item.id == currentOrg.id"
         :label="item.name"
-        :value="item.id">
-      </el-option>
+        :value="item.id"
+      />
     </el-select>
   </transition>
 </template>
diff --git a/src/layout/components/NavHeader/AccountDropdown.vue b/src/layout/components/NavHeader/AccountDropdown.vue
new file mode 100644
index 000000000..b73dad814
--- /dev/null
+++ b/src/layout/components/NavHeader/AccountDropdown.vue
@@ -0,0 +1,38 @@
+<template>
+  <div class="header-tools header-profile">
+    <el-dropdown>
+      <span class="el-dropdown-link">
+        <img src="@/assets/img/admin.png" class="header-avatar"> {{ currentUser.name }}
+        <i class="el-icon-arrow-down el-icon--right" />
+      </span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item icon="el-icon-user" command="profile">{{ $t('Profile') }}</el-dropdown-item>
+        <el-dropdown-item icon="el-icon-guide" command="changePage">{{ $t('User page') }}</el-dropdown-item>
+        <el-dropdown-item icon="el-icon-key" command="apiKey">{{ $t('API Key') }}</el-dropdown-item>
+        <el-dropdown-item divided command="logout">{{ $t('Logout') }}</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+export default {
+  name: 'AccountDropdown',
+  computed: {
+    ...mapGetters([
+      'currentUser'
+    ])
+  }
+}
+</script>
+
+<style scoped>
+  .header-avatar {
+    height: 30px;
+    width: 30px;
+    border-radius: 50%;
+    margin-right: 5px;
+    vertical-align: middle;
+  }
+</style>
diff --git a/src/layout/components/NavHeader/index.vue b/src/layout/components/NavHeader/index.vue
index 3aa516c64..baf339d85 100644
--- a/src/layout/components/NavHeader/index.vue
+++ b/src/layout/components/NavHeader/index.vue
@@ -5,59 +5,32 @@
       <breadcrumb class="breadcrumb-container" />
     </div>
     <div class="navbar-right">
-      <div class="">
-        <el-dropdown trigger="click">
-        <span class="el-dropdown-link">
-          下拉菜单 <i class="el-icon-arrow-down el-icon--right"></i>
-        </span>
+      <div class="header-item">
+        <el-dropdown>
+          <span class="el-dropdown-link">
+            {{ $t('common.Help') }}<i class="el-icon-arrow-down el-icon--right" />
+          </span>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item icon="el-icon-plus">黄金糕</el-dropdown-item>
-            <el-dropdown-item icon="el-icon-circle-plus">狮子头</el-dropdown-item>
-            <el-dropdown-item icon="el-icon-circle-plus-outline">螺蛳粉</el-dropdown-item>
-            <el-dropdown-item icon="el-icon-check">双皮奶</el-dropdown-item>
-            <el-dropdown-item icon="el-icon-circle-check">蚵仔煎</el-dropdown-item>
+            <el-dropdown-item icon="el-icon-plus">{{ $t('Docs') }}</el-dropdown-item>
+            <el-dropdown-item icon="el-icon-circle-plus">{{ $t('Support') }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
       </div>
-
+      <div class="header-item">
+        <el-dropdown>
+          <span class="el-dropdown-link">
+            {{ $t('common.Language') }}<i class="el-icon-arrow-down el-icon--right" />
+          </span>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item>中文(简体)</el-dropdown-item>
+            <el-dropdown-item>English</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+      <div class="header-item header-profile">
+        <AccountDropdown />
+      </div>
     </div>
-
-    <!--    <el-menu class="el-menu-demo" mode="horizontal">-->
-    <!--      <el-menu-item index="0"></el-menu-item>-->
-    <!--      <el-menu-item index="1"><breadcrumb class="breadcrumb-container" /></el-menu-item>-->
-    <!--      <el-submenu index="2" class="el-submenu-right">-->
-    <!--        <template slot="title">-->
-    <!--          <img-->
-    <!--            src="@/assets/img/admin.png"-->
-    <!--            class="header-menu-logo"-->
-    <!--            style="height:30px;weight:30px;border-radius: 50%;margin-right:5px;"-->
-    <!--          >管理员-->
-    <!--        </template>-->
-    <!--        <el-menu-item index="2-1">个人信息</el-menu-item>-->
-    <!--        <el-menu-item index="2-2">用户界面</el-menu-item>-->
-    <!--        <el-menu-item index="2-2">API key</el-menu-item>-->
-    <!--        <el-menu-item index="2-2">注销登录</el-menu-item>-->
-    <!--      </el-submenu>-->
-    <!--      <el-dropdown trigger="click">-->
-    <!--      <span class="el-dropdown-link">-->
-    <!--        下拉菜单<i class="el-icon-arrow-down el-icon--right"></i>-->
-    <!--      </span>-->
-    <!--        <el-dropdown-menu slot="dropdown">-->
-    <!--          <el-dropdown-item icon="el-icon-plus">中文</el-dropdown-item>-->
-    <!--          <el-dropdown-item icon="el-icon-circle-plus">英文</el-dropdown-item>-->
-    <!--        </el-dropdown-menu>-->
-    <!--      </el-dropdown>-->
-    <!--      <el-submenu index="3" class="el-submenu-right">-->
-    <!--        <template slot="title" style="font-weight:600;"><i class="fa fa-globe header-menu-icon" style="margin-right:5px;" />{{ $t('header.language') }}</template>-->
-    <!--        <el-menu-item index="3-1" @click="changeLangToZH()">中文</el-menu-item>-->
-    <!--        <el-menu-item index="3-2" @click="changeLangToEnglish()">English</el-menu-item>-->
-    <!--      </el-submenu>-->
-    <!--      <el-submenu index="4" class="el-submenu-right">-->
-    <!--        <template slot="title"><i class="fa fa-handshake-o header-menu-icon" style="margin-right:5px;" />{{ $t('header.help') }}</template>-->
-    <!--        <el-menu-item index="4-1">{{ $t('header.Documents') }}</el-menu-item>-->
-    <!--        <el-menu-item index="4-2">{{ $t('header.CommercialSupport') }}</el-menu-item>-->
-    <!--      </el-submenu>-->
-    <!--    </el-menu>-->
   </div>
 </template>
 
@@ -65,11 +38,13 @@
 import { mapGetters } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
+import AccountDropdown from './AccountDropdown'
 
 export default {
   components: {
     Breadcrumb,
-    Hamburger
+    Hamburger,
+    AccountDropdown
   },
   computed: {
     ...mapGetters([
@@ -94,42 +69,13 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-  .el-header{
-    background-color: #ffffff;
-    //border-bottom: 1px solid #e7eaec !important;
-  }
-  .el-submenu-right{
-    float: right !important;
-  }
-  //重置Font-weight
-  .el-submenu-right /deep/ .el-submenu__title{
-    font-weight: 600;
-    border-bottom: 0px !important;
-    color: #888888 !important;
-  }
-  //重置导航菜单选中样式
-  .el-menu--horizontal>.el-menu-item.is-active {
-    border-bottom: 0px;
-  }
-  .el-menu--horizontal>.el-menu-item{
-    height: 50px;
-    line-height: 50px;
-  }
-  .el-submenu-right /deep/ .el-submenu__title{
-    height: 50px;
-    padding: 0 20px !important;
-    line-height: 50px;
-  }
-</style>
-
 <style lang="scss" scoped>
   .navbar {
     height: 50px;
     overflow: hidden;
     position: relative;
     background: #fff;
-    box-shadow: 0 1px 4px rgba(0,21,41,.08);
+    box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
 
     .hamburger-container {
       line-height: 50px;
@@ -137,19 +83,27 @@ export default {
       float: left;
       cursor: pointer;
       transition: background .3s;
-      -webkit-tap-highlight-color:transparent;
+      -webkit-tap-highlight-color: transparent;
       padding-left: 20px;
     }
 
     .navbar-right {
       float: right;
-      /*<!--margin-right: -15px;-->*/
+      margin-right: 10px;
+    }
+
+    .header-item {
+      line-height: 50px;
+      display: inline-block;
+      padding-right: 20px;
     }
 
     .breadcrumb-container {
       float: left;
+      padding-left: 20px;
     }
 
+    /*
     .right-menu {
       float: right;
       height: 100%;
@@ -201,5 +155,10 @@ export default {
         }
       }
     }
+     */
+  }
+  .el-header {
+    background-color: #ffffff;
   }
 </style>
+
diff --git a/src/store/getters.js b/src/store/getters.js
index 73d009330..5a6275e6d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -9,6 +9,7 @@ const getters = {
   userAdminOrgList: state => state.user.orgs,
   permission_routes: state => state.permission.routes,
   visitedViews: state => state.tagsView.visitedViews,
-  cachedViews: state => state.tagsView.cachedViews
+  cachedViews: state => state.tagsView.cachedViews,
+  currentUser: state => state.user.user
 }
 export default getters
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 89f7e05b9..36cf9903c 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -22,7 +22,8 @@ const getDefaultState = () => {
     avatar: '',
     roles: [],
     currentOrg: getCurrentOrg(),
-    orgs: []
+    orgs: [],
+    user: {}
   }
 }
 
@@ -57,6 +58,9 @@ const mutations = {
     state.currentOrg = z
     console.log(z)
     setCurrentOrg(z)
+  },
+  SET_USER(state, user) {
+    state.user = user
   }
 }
 
@@ -97,6 +101,7 @@ const actions = {
         if (!rules || rules.length <= 0) {
           reject('getInfo: roles must be a non-null array!')
         }
+        commit('SET_USER', response)
         commit('SET_ROLES', rules)
         commit('SET_NAME', name)
         commit('SET_AVATAR', avatar_url)
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 5af0d7822..cb8038865 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -82,3 +82,12 @@ td .el-button.el-button--mini {
 .main-container {
   background-color: #f3f3f4;
 }
+
+.el-dropdown:hover {
+  cursor: pointer;
+}
+
+.el-dropdown-menu__item:focus, .el-dropdown-menu__item:not(.is-disabled):hover {
+  background-color: #f5f5f5;
+  color: inherit;
+}