diff --git a/media/css/seahub.css b/media/css/seahub.css
index 6a030b08ef..af24700804 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -119,7 +119,6 @@ table img {
 #header {
     font-size: 14px;
     font-weight: bold;
-    border-bottom: 1px solid #ddd;
 }
 #main {
     min-height: 400px;
@@ -170,6 +169,7 @@ table img {
 #other-info { color: #ccc; text-align:right; }
 #other-info .wish { font-style:italic; margin-bottom:10px; }
 #other-info .version { font-size: 12px; }
+#header .nav { padding: 20px 20px 0 40px; }
 #header .nav li { float: left; height: 18px; padding: 0px 25px 4px 0; }
 #header .nav a, #header .nav a:visited { color:#8A948F; font-weight:bold; text-decoration:none; }
 #header .nav a.cur { color:#000; }
diff --git a/media/img/logo.png b/media/img/logo.png
index 21e2890945..9da5cda1a4 100644
Binary files a/media/img/logo.png and b/media/img/logo.png differ
diff --git a/templates/admin_base.html b/templates/admin_base.html
index d7272597bf..8447c9b0fd 100644
--- a/templates/admin_base.html
+++ b/templates/admin_base.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block top_bar_manager_class %} class="cur"{% endblock %}
 {% block nav %}
-<ul class="nav w100 ovhd">
+<ul class="nav ovhd">
     {% if request.user.is_staff %}
     <li>
         <a href="{{ SITE_ROOT }}sys/seafadmin/" {% block nav_seafadmin_class %}{% endblock %}>目录管理</a>
diff --git a/templates/base.html b/templates/base.html
index 3828e8d5c2..18c8ddc625 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -62,12 +62,9 @@
 
     <div id="header">
         <div class="top-info w100 ovhd">
-            <img src="{{ MEDIA_URL }}img/logo.png" title="Seafile" alt="Seafile logo" class="fleft" />
-            <div id="other-info" class="fright">
-                <p class="wish">Hope our efforts will bring you benefits.</p>
-            </div>
+            <img src="{{ MEDIA_URL }}img/logo.png" title="Seafile" alt="Seafile logo" class="fleft" height="48" />
+            {% block nav %}{% endblock %}
         </div>
-        {% block nav %}{% endblock %}
     </div>
 
     <div id="main">
diff --git a/templates/myhome_base.html b/templates/myhome_base.html
index 52a482b1b9..a7e0bb40c5 100644
--- a/templates/myhome_base.html
+++ b/templates/myhome_base.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block top_bar_myaccount_class %} class="cur"{% endblock %}
 {% block nav %}
-<ul class="nav w100 ovhd">
+<ul class="nav ovhd">
     <li>
         <a href="{{ SITE_ROOT }}home/my/" {% block nav_myhome_class %}{% endblock %}>我的页面</a>
     </li>
diff --git a/templates/org_admin_base.html b/templates/org_admin_base.html
index c0ece661b1..dd94f1238d 100644
--- a/templates/org_admin_base.html
+++ b/templates/org_admin_base.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block top_bar_manager_class %} class="cur"{% endblock %}
 {% block nav %}
-<ul class="nav w100 ovhd">
+<ul class="nav ovhd">
     {% if request.user.org.is_staff %}
     <li>
         <a href="{{ SITE_ROOT }}seafadmin/" {% block nav_seafadmin_class %}{% endblock %}>目录管理</a>