diff --git a/base/context_processors.py b/base/context_processors.py
index 02fae3b00b..9d9becd65d 100644
--- a/base/context_processors.py
+++ b/base/context_processors.py
@@ -10,7 +10,7 @@ import settings
 
 def version(request):
     """
-    Adds seafile version to the context
+    Add seafile version to the context.
     
     """
     return {'seafile_version': settings.SEAFILE_VERSION}
diff --git a/media/css/seahub.css b/media/css/seahub.css
index 90c38aea25..23df82251f 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -65,6 +65,9 @@ tr.first { background-color: #00FF00; }
 .top-bar { height:20px; color:#fff; text-align:right; font-weight:bold; background:#606; }
 .top-bar-in { width:950px; margin:0 auto; }
 .top-bar a { color:#ddd; font-weight:normal; }
+.top-bar a.adminconsole { float:left; color:#ddd; font-weight:normal; }
+.top-bar a.myaccount { float:left; color:#ddd; font-weight:normal; }
+
 .top-bar a:hover { background:#A0A; }
 /* header */
 #header .top-info { margin-bottom:5px;}
diff --git a/templates/add_user_form.html b/templates/add_user_form.html
index 00ea34d1bf..17c7344dd7 100644
--- a/templates/add_user_form.html
+++ b/templates/add_user_form.html
@@ -1,4 +1,4 @@
-{% extends "myhome_base.html" %}
+{% extends "admin_base.html" %}
 {% block title %}添加用户{% endblock %}
 {% block nav_useradmin_class %}class="cur"{% endblock %}
 {% block main_panel %}
diff --git a/templates/admin_base.html b/templates/admin_base.html
new file mode 100644
index 0000000000..252ad4d58e
--- /dev/null
+++ b/templates/admin_base.html
@@ -0,0 +1,14 @@
+{% extends "base.html" %}
+{% block nav %}
+<ul class="nav ovhd">
+    {% if request.user.is_staff %}
+    <li>
+        <a href="{{ SITE_ROOT }}seafadmin/" {% block nav_seafadmin_class %}{% endblock %}>目录管理</a>
+    </li>
+    <li>
+        <a href="{{ SITE_ROOT }}useradmin/" {% block nav_useradmin_class %}{% endblock %}>用户管理</a>
+    </li>
+    {% endif %}
+</ul>
+{% endblock %}
+
diff --git a/templates/base.html b/templates/base.html
index 38e0b16a3a..b1f271af6e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -17,6 +17,10 @@
     <div id="top-bar">
         <div class="top-bar">
             <div class="top-bar-in">
+                {% if request.user.is_staff %}
+                <a href="{{ SITE_ROOT }}seafadmin/" class="adminconsole">管理员控制台</a>
+                <a href="{{ SITE_ROOT }}home/my/" class="myaccount">我的帐号</a>
+                {% endif %}
                 {% if request.user.is_authenticated %}
                 欢迎, {{ request.user }}
                 <a href="{{ SITE_ROOT }}profile/">设置</a>
diff --git a/templates/myhome_base.html b/templates/myhome_base.html
index 14ecce8e9f..542269662b 100644
--- a/templates/myhome_base.html
+++ b/templates/myhome_base.html
@@ -13,14 +13,6 @@
     <li>
         <a href="{{ SITE_ROOT }}group/" {% block nav_group_class %}{% endblock %}>小组</a>
     </li>
-    {% if request.user.is_staff %}
-    <li>
-        <a href="{{ SITE_ROOT }}seafadmin/" {% block nav_seafadmin_class %}{% endblock %}>目录管理</a>
-    </li>
-    <li>
-        <a href="{{ SITE_ROOT }}useradmin/" {% block nav_useradmin_class %}{% endblock %}>用户管理</a>
-    </li>
-    {% endif %}
     <li>
         <a href="{{ SITE_ROOT}}back/local/">回到本地</a>
     </li>
@@ -28,7 +20,6 @@
     <li>
         <a href="http://www.gonggeng.org/seasite/help/" target="_blank">使用帮助</a>
     </li>
-    
     <!--
     <li>
         <a href="{{ SITE_ROOT }}repos/my/">Files</a>
diff --git a/templates/repos.html b/templates/repos.html
index b131d570cb..fbb1ff8356 100644
--- a/templates/repos.html
+++ b/templates/repos.html
@@ -1,4 +1,4 @@
-{% extends "myhome_base.html" %}
+{% extends "admin_base.html" %}
  {% block nav_seafadmin_class %}class="cur"{% endblock %}
 
 {% block right_panel %}
diff --git a/templates/useradmin.html b/templates/useradmin.html
index d2dcf42675..16f4f4a90c 100644
--- a/templates/useradmin.html
+++ b/templates/useradmin.html
@@ -1,4 +1,4 @@
-{% extends "myhome_base.html" %}
+{% extends "admin_base.html" %}
 
 {% block nav_useradmin_class %}class="cur"{% endblock %}
 {% block left_panel %}
diff --git a/urls.py b/urls.py
index fce83805fc..d230cf638d 100644
--- a/urls.py
+++ b/urls.py
@@ -7,7 +7,8 @@ from seahub.views import root, peers, myhome, \
     role_add, role_remove, activate_user, user_add, user_remove, \
     ownerhome, remove_fetched_repo, \
     repo_list_dir, user_info, repo_set_access_property, repo_operation_file, \
-    repo_add_share, repo_list_share, repo_remove_share, repo_download, seafile_access_check, back_local
+    repo_add_share, repo_list_share, repo_remove_share, repo_download, \
+    seafile_access_check, back_local
 
 # Uncomment the next two lines to enable the admin:
 #from django.contrib import admin