diff --git a/media/css/seahub.css b/media/css/seahub.css
index ce1f4c4602..1ecd75e444 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -568,6 +568,11 @@ textarea:-moz-placeholder {/* for FF */
     overflow:hidden;
     text-overflow:ellipsis;
 }
+.split {
+    border-left:2px solid #888;
+    padding-left:1em;
+    margin-left:1em;
+}
 
 /*******ui widgets**************/
 /**** path ****/
@@ -1967,29 +1972,6 @@ button.sf-dropdown-toggle:focus {
     position:absolute;
     top:5px;
 }
-#grp-avatar-form {
-    position:relative;
-    margin-left:10px;
-}
-/*repo page*/
-#repo-top {
-    padding-bottom:15px;
-}
-#repo-top .hd,
-#repo-basic-info {
-    display:inline-block;
-}
-#repo-top .hd {
-    margin-right:15px;
-}
-#repo-basic-info .link-icon {
-    margin:0 5px 0 15px;
-}
-.split {
-    border-left:2px solid #888;
-    padding-left:1em;
-    margin-left:1em;
-}
 #repo-file-list {
     margin-bottom:100px;
 }
@@ -2145,13 +2127,6 @@ button.sf-dropdown-toggle:focus {
     font-size:16px;
     line-height:1;
 }
-.repo-top-op-btn {
-    font-size:14px;
-}
-.repo-top-op-btn [class^="icon-"] {
-    color:#444;
-    margin-right:2px;
-}
 #repo-latest-commit .avatar {
     vertical-align:middle;
 }
diff --git a/seahub/templates/home_base.html b/seahub/templates/home_base.html
index 71663a4d5c..df8f844671 100644
--- a/seahub/templates/home_base.html
+++ b/seahub/templates/home_base.html
@@ -8,9 +8,9 @@
         <h3 class="hd">{% trans "Files" %}</h3>
         <ul class="side-tabnav-tabs">
             {% if user.permissions.can_add_repo %}
-            <li class="tab"><a href="{{ SITE_ROOT }}#my-libs/"><span class="sf2-icon-user"></span>{% trans "Mine" %}</a></li>
+            <li class="tab"><a href="{{ SITE_ROOT }}#my-libs/" class="ellipsis" title="{% trans "My Libraries" %}"><span class="sf2-icon-user"></span>{% trans "My Libraries" %}</a></li>
             {% endif %}
-            <li class="tab"><a href="{{ SITE_ROOT }}#shared-libs/"><span class="sf2-icon-share"></span>{% trans "Shared" %}</a></li>
+            <li class="tab"><a href="{{ SITE_ROOT }}#shared-libs/" class="ellipsis" title="{% trans "Shared to me" %}"><span class="sf2-icon-share"></span>{% trans "Shared to me" %}</a></li>
             {% if user.permissions.can_view_org %}
             <li class="tab"><a href="{{ SITE_ROOT }}#org/"><span class="sf2-icon-organization"></span>{% trans "Organization" %}</a></li>
             {% endif %}
@@ -37,7 +37,7 @@
             {% endif %}
         </div>
         <ul class="side-tabnav-tabs">
-            <li class="tab"><a href="{{ SITE_ROOT }}#starred/"><span class="sf2-icon-star"></span>{% trans "Starred" %}</a></li>
+            <li class="tab"><a href="{{ SITE_ROOT }}#starred/"><span class="sf2-icon-star"></span>{% trans "Favorites" %}</a></li>
             {% if events_enabled %}
             <li class="tab"><a href="{{ SITE_ROOT }}#activities/"><span class="sf2-icon-clock"></span>{% trans "Activities" %}</a></li>
             {% endif %}
@@ -46,7 +46,7 @@
             <li class="tab {% block cur_personal_wiki %}{% endblock %}"><a href="{% url 'personal_wiki' %}"><span class="sf2-icon-wiki"></span>{% trans "Personal Wiki" %}</a></li>
             {% endif %}
             {% endfor %}
-            <li class="tab"><a href="{{ SITE_ROOT }}#devices/"><span class="sf2-icon-monitor"></span>{% trans "Devices" %}</a></li>
+            <li class="tab"><a href="{{ SITE_ROOT }}#devices/" class="ellipsis" title="{% trans "Linked Devices" %}"><span class="sf2-icon-monitor"></span>{% trans "Linked Devices" %}</a></li>
         </ul>
 
         <h3 class="hd">{% trans "Share Admin" %}</h3>
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index f361beab0c..a0859b5fe9 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -158,9 +158,9 @@
     <% } else if (context == 'org') { %>
         <li><a href="#<%= category %>/" class="path-link normal">{% trans "Organization" %}</a></li>
     <% } else if (context == 'common') { %>
-        <li><a href="#my-libs/" class="path-link normal">{% trans "Mine" %}</a></li>
+        <li><a href="#my-libs/" class="path-link normal">{% trans "My Libraries" %}</a></li>
     <% } else { %>
-        <li><a href="#<%= category %>/" class="path-link normal"><% if (category == 'my-libs') { %>{% trans "Mine" %}<% } %><% if (category == 'shared-libs') { %>{% trans "Shared" %}<% } %></a></li>
+        <li><a href="#<%= category %>/" class="path-link normal"><% if (category == 'my-libs') { %>{% trans "My Libraries" %}<% } %><% if (category == 'shared-libs') { %>{% trans "Shared to me" %}<% } %></a></li>
     <% } %>
     <% if (path == '/') { %>
         <li><%- repo_name %></li>
@@ -612,12 +612,12 @@
     <ul class="side-tabnav-tabs">
         {% if user.permissions.can_add_repo %}
         <li class="tab<% if (cur_tab == 'mine') { %> tab-cur<% } %>">
-            <a href="{{ SITE_ROOT }}#my-libs/"><span aria-hidden="true" class="sf2-icon-user"></span>{% trans "Mine" %}</a>
+            <a href="{{ SITE_ROOT }}#my-libs/" class="ellipsis" title="{% trans "My Libraries" %}"><span aria-hidden="true" class="sf2-icon-user"></span>{% trans "My Libraries" %}</a>
         </li>
         {% endif %}
 
         <li class="tab<% if (cur_tab == 'shared') { %> tab-cur<% } %>">
-            <a href="{{ SITE_ROOT }}#shared-libs/" class="ellipsis" title="{% trans "Shared" %}"><span aria-hidden="true" class="sf2-icon-share"></span>{% trans "Shared" %}</a>
+            <a href="{{ SITE_ROOT }}#shared-libs/" class="ellipsis" title="{% trans "Shared to me" %}"><span aria-hidden="true" class="sf2-icon-share"></span>{% trans "Shared to me" %}</a>
         </li>
 
         {% if user.permissions.can_view_org %}
@@ -672,7 +672,7 @@
     </div>
     <ul class="side-tabnav-tabs">
         <li class="tab<% if (cur_tab == 'starred') { %> tab-cur<% } %>">
-            <a href="{{ SITE_ROOT }}#starred/"><span aria-hidden="true" class="sf2-icon-star"></span>{% trans "Starred" %}</a>
+            <a href="{{ SITE_ROOT }}#starred/"><span aria-hidden="true" class="sf2-icon-star"></span>{% trans "Favorites" %}</a>
         </li>
         {% if events_enabled %}
         <li class="tab<% if (cur_tab == 'activities') { %> tab-cur<% } %>">
@@ -687,7 +687,7 @@
             <% } %>
         <% } %>
         <li class="tab<% if (cur_tab == 'devices') { %> tab-cur<% } %>">
-            <a href="{{ SITE_ROOT }}#devices/"><span aria-hidden="true" class="sf2-icon-monitor"></span>{% trans "Devices" %}</a>
+            <a href="{{ SITE_ROOT }}#devices/" class="ellipsis" title="{% trans "Linked Devices" %}"><span aria-hidden="true" class="sf2-icon-monitor"></span>{% trans "Linked Devices" %}</a>
         </li>
     </ul>
 
diff --git a/seahub/templates/libraries.html b/seahub/templates/libraries.html
index 93e8ea6a6e..58cb0439ec 100644
--- a/seahub/templates/libraries.html
+++ b/seahub/templates/libraries.html
@@ -10,7 +10,7 @@
 {% block extra_script %}
 <script type="text/template" id="my-own-repos-tmpl">
     <div class="hd ovhd">
-        <h3 class="fleft">{% trans "Mine" %}</h3>
+        <h3 class="fleft">{% trans "My Libraries" %}</h3>
         <button class="repo-create fright"><span aria-hidden="true" class="icon-plus-square add vam"></span><span class="vam">{% trans "New Library" %}</span></button>
     </div>
     <table class="my-own-repos-table hide">
@@ -26,7 +26,7 @@
 </script>
 
 <script type="text/template" id="repos-shared-to-me-tmpl">
-    <h3 class="hd">{% trans "Shared" %}</h3>
+    <h3 class="hd">{% trans "Shared to me" %}</h3>
     <table class="hide">
         <thead></thead>
         <tbody></tbody>
@@ -160,7 +160,7 @@
 </script>
 
 <script type="text/template" id="starred-file-tmpl">
-    <h3 class="hd">{% trans "Starred" %}</h3>
+    <h3 class="hd">{% trans "Favorites" %}</h3>
     <table class="hide">
         <thead>
             <tr>
@@ -187,7 +187,7 @@
 </script>
 
 <script type="text/template" id="devices-tmpl">
-    <h3 class="hd">{% trans "Devices" %}</h3>
+    <h3 class="hd">{% trans "Linked Devices" %}</h3>
     <table class="hide">
         <thead>
             <tr>