diff --git a/media/css/seahub.css b/media/css/seahub.css
index 5d54e80d2c..8e61d58e11 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -939,14 +939,16 @@ textarea:-moz-placeholder {/* for FF */
 }
 #right-panel .hd,
 .tabnav,
-.repo-file-list-topbar {
+.repo-file-list-topbar,
+.wiki-top {
     padding:9px 10px;
     background:#f2f2f2;
     margin-bottom:.5em;
     border-radius:2px;
 }
 #right-panel .hd,
-.tabnav {
+.tabnav,
+.wiki-top {
     padding-bottom:0;
     height:39px;
 }
@@ -964,7 +966,8 @@ textarea:-moz-placeholder {/* for FF */
     top:0;
 }
 #right-panel .hd .a,
-.tabnav-tab a {
+.tabnav-tab a,
+.wiki-nav .link {
     display:inline-block;
     font-size:15px;
     color:#333;
@@ -976,6 +979,8 @@ textarea:-moz-placeholder {/* for FF */
 }
 .tabnav-tab-cur a,
 .tabnav-tab a:hover,
+.wiki-nav .cur-item .link,
+.wiki-nav .link:hover,
 #right-panel .hd .ui-state-active .a,
 #right-panel .hd .a:hover {
     color:#eb8205;
@@ -984,7 +989,8 @@ textarea:-moz-placeholder {/* for FF */
 }
 #right-panel .hd button,
 .tabnav button,
-.repo-file-list-topbar button {
+.repo-file-list-topbar button,
+.wiki-top .op-btn {
     height:29px;
     background:#fff;
     line-height:17px;
@@ -2532,32 +2538,20 @@ textarea:-moz-placeholder {/* for FF */
 }
 
 /* wiki page */
-.wiki-top {
+.wiki-top {/* for lang with long words */
     text-align:right;
-    padding-bottom:4px;
-    border-bottom:1px solid #eee;
+    height:auto;
 }
 .wiki-top .op-btn {
     margin-left:3px;
-    padding-top:0;
-    padding-bottom:0;
-    height:24px;
 }
 .wiki-nav .item {
     float:left;
-    font-size:15px;
-    line-height:24px;
-    margin:0 5px 0 10px;
 }
 .wiki-nav .link {
     color:#333;
     font-weight:normal;
 }
-.wiki-nav .cur-item .link,
-.wiki-nav .link:hover {
-    color: #eb8205;
-    text-decoration: underline;
-}
 #wiki-area {
     padding: 0 0;
 }
diff --git a/seahub/group/templates/group/group_wiki.html b/seahub/group/templates/group/group_wiki.html
index 56f4fbfd46..da399b89b6 100644
--- a/seahub/group/templates/group/group_wiki.html
+++ b/seahub/group/templates/group/group_wiki.html
@@ -63,7 +63,7 @@
     </form>
 
     {% else %}
-    <div class="wiki-top w100 ovhd">
+    <div class="wiki-top ovhd">
         <ul class="wiki-nav fleft">
             <li class="item{% if page == 'home' %} cur-item{% endif %}"><a href="{% url 'group_wiki' group.id %}" class="link">{% trans "Home" %}</a></li>
             <li class="item"><a href="{% url 'group_wiki_pages' group.id %}" class="link">{% trans "Pages" %}</a></li>
diff --git a/seahub/group/templates/group/group_wiki_pages.html b/seahub/group/templates/group/group_wiki_pages.html
index 49a52b1c5e..1663ec8b0d 100644
--- a/seahub/group/templates/group/group_wiki_pages.html
+++ b/seahub/group/templates/group/group_wiki_pages.html
@@ -6,7 +6,7 @@
 {% block cur_wiki %}tab-cur{% endblock %}
 
 {% block right_panel %}
-<div class="wiki-top w100 ovhd">
+<div class="wiki-top ovhd">
     <ul class="wiki-nav fleft">
         <li class="item"><a href="{% url 'group_wiki' group.id %}" class="link">{% trans "Home" %}</a></li>
         <li class="item cur-item"><a href="{% url 'group_wiki_pages' group.id %}" class="link">{% trans "Pages" %}</a></li>
diff --git a/seahub/templates/wiki/personal_wiki.html b/seahub/templates/wiki/personal_wiki.html
index 33ffdb6e6a..ff0d5597fa 100644
--- a/seahub/templates/wiki/personal_wiki.html
+++ b/seahub/templates/wiki/personal_wiki.html
@@ -58,13 +58,13 @@
     </form>
 
     {% else %}
-    <div class="wiki-top w100 ovhd">
+    <div class="wiki-top ovhd">
         <ul class="wiki-nav fleft">
             <li class="item{% if page == 'home' %} cur-item{% endif %}"><a href="{% url 'personal_wiki' %}" class="link">{% trans "Home" %}</a></li>
             <li class="item"><a href="{% url 'personal_wiki_pages' %}" class="link">{% trans "Pages" %}</a></li>
             <li class="item"><a href="{% url 'repo_history' repo_id %}" target="_blank" class="link">{% trans "Wiki History" %}</a></li>
         </ul>
-        
+
         <button id="page-create" class="op-btn">{% trans "New Page" %}</button>
         <button id="page-delete" class="op-btn" data-url="{% url 'personal_wiki_page_delete' page %}">{% trans "Delete Page" %}</button>
         <button id="page-edit" class="op-btn">{% trans "Edit Page" %}</button>
diff --git a/seahub/templates/wiki/personal_wiki_pages.html b/seahub/templates/wiki/personal_wiki_pages.html
index eea55768c3..8d905f7263 100644
--- a/seahub/templates/wiki/personal_wiki_pages.html
+++ b/seahub/templates/wiki/personal_wiki_pages.html
@@ -8,7 +8,7 @@
 {% block cur_personal_wiki %}tab-cur{% endblock %}
 
 {% block right_panel %}
-<div class="wiki-top w100 ovhd">
+<div class="wiki-top ovhd">
     <ul class="wiki-nav fleft">
         <li class="item"><a href="{% url 'personal_wiki' %}" class="link">{% trans "Home" %}</a></li>
         <li class="item cur-item"><a href="{% url 'personal_wiki_pages' %}" class="link">{% trans "Pages" %}</a></li>