diff --git a/media/css/seahub.css b/media/css/seahub.css
index b86e4c08a7..bc2557c0ef 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -703,18 +703,18 @@ textarea:-moz-placeholder {/* for FF */
 }
 /* Hide for mobile, show later */
 @media (min-width: 768px) {
-    .side-tabnav {
+    .side-nav {
         position:fixed;
         top:52px;
         bottom:0;
         z-index:1;
-        padding:0;
+        padding:20px;
         overflow:hidden;
         border-right:1px solid #eee;
     }
 }
 @media (max-width: 767px) {
-    .side-tabnav {
+    .side-nav {
         background: #f8f8f8;
         width:300px;
         position:fixed;
@@ -722,22 +722,29 @@ textarea:-moz-placeholder {/* for FF */
         top:0;
         bottom:0;
         z-index:1;
+        padding:20px;
         overflow:hidden;
         border-right:1px solid #eee;
         box-shadow:0 0 4px #ccc;
     }
 }
-.side-tabnav {
+.side-nav:hover {
+    overflow-y:auto;
+}
+.side-nav {
     -webkit-transition: all 0.3s ease;
     -moz-transition: all 0.3s ease;
     transition: all 0.3s ease;
-    display: flex;
-    flex-direction: column;
+}
+.home-side-nav {
+    display:flex;
+    flex-direction:column;
+    padding:0;
 }
 .side-nav-con {
     overflow:hidden;
     padding:20px;
-    flex-grow: 1;
+    flex-grow:1;
 }
 .side-nav-con:hover {
     overflow-y:auto;
diff --git a/seahub/group/templates/group/group_base.html b/seahub/group/templates/group/group_base.html
index 2ad383cf45..0d6579301d 100644
--- a/seahub/group/templates/group/group_base.html
+++ b/seahub/group/templates/group/group_base.html
@@ -6,7 +6,7 @@
 
 {% block main_content %}
 
-<div class="side-tabnav col-md-3">
+<div class="side-tabnav side-nav col-md-3">
 {% block left_panel %}
     <div class="hd w100 ovhd">
         <h3>
diff --git a/seahub/help/templates/help/help_base.html b/seahub/help/templates/help/help_base.html
index 738e6cca4f..278fab3dd3 100644
--- a/seahub/help/templates/help/help_base.html
+++ b/seahub/help/templates/help/help_base.html
@@ -1,9 +1,10 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block cur_help %}cur{% endblock %}
-{% block left_panel %}
-<div class="side-textnav">
+{% block main_content %}
+<div class="row">
+
+<div class="side-textnav col-md-3 side-nav">
 	<h3 class="hd">{% trans "Client" context "help" %}</h2>
     <ul class="side-textnav-tabs">
 		<li class="tab {%block install %}{% endblock %}"><a href="{{ SITE_ROOT }}help/install/">{% trans "Install and Sync Files" %}</a></li>
@@ -18,10 +19,10 @@
 		<li class="tab {%block view_enc %}{% endblock %}"><a href="{{ SITE_ROOT }}help/view_encrypted/">{% trans "Viewing an encrypted library" %}</a></li>
 	</ul>
 </div>
-{% endblock %}
 
-{% block right_panel %}
-<div class="help-con article">{% block help_con %}{% endblock %}</div>
+<div class="help-con article col-md-9 col-md-offset-3" id="right-panel">{% block help_con %}{% endblock %}</div>
+
+</div>
 {% endblock %}
 
 {% block extra_script %}
diff --git a/seahub/profile/templates/profile/set_profile.html b/seahub/profile/templates/profile/set_profile.html
index 65ec6c1eb5..731297447b 100644
--- a/seahub/profile/templates/profile/set_profile.html
+++ b/seahub/profile/templates/profile/set_profile.html
@@ -7,7 +7,7 @@
 {% block main_content %}
 <div class="row">
 
-<div class="side-tabnav side-textnav col-md-3" id="side-nav" role="navigation">
+<div class="side-nav side-textnav col-md-3" id="side-nav" role="navigation">
     <ul class="side-textnav-tabs">
         <li class="tab"><a href="#user-basic-info">{% trans "Profile" %}</a></li>
         <li class="tab"><a href="#lang-setting">{% trans "Language" %}</a></li>
diff --git a/seahub/templates/base_for_backbone.html b/seahub/templates/base_for_backbone.html
index 8b722f0f98..7d2c3adef6 100644
--- a/seahub/templates/base_for_backbone.html
+++ b/seahub/templates/base_for_backbone.html
@@ -75,17 +75,16 @@
         </div>
 
         <div id="main" class="clear container-fluid top-padding">
+            <div class="row initial-loading">
+                <span class="loading-icon loading-tip"></span>
+            </div>
+
             <div class="row main-content hide">
-                <div class="side-tabnav col-md-3" id="side-nav" role="navigation"></div>
+                <div class="side-nav side-tabnav home-side-nav col-md-3" id="side-nav" role="navigation"></div>
                 <div id="right-panel" class="col-md-9 col-md-offset-3">
                     {% block right_panel %}{% endblock %}
                 </div>
             </div>
-            <div class="row initial-loading">
-                <div id="initial-loading-view" class="clear w100 ovhd">
-                    <span class="loading-icon loading-tip"></span>
-                </div>
-            </div>
 
             <div id="confirm-popup" class="hide">
                 <div id="confirm-con"></div>
diff --git a/seahub/templates/home_base.html b/seahub/templates/home_base.html
index 1b5abc6cbb..71663a4d5c 100644
--- a/seahub/templates/home_base.html
+++ b/seahub/templates/home_base.html
@@ -3,7 +3,7 @@
 
 {% block main_content %}
 <div class="row">
-    <div id="side-nav" class="side-tabnav col-md-3" >
+    <div id="side-nav" class="side-nav side-tabnav col-md-3" >
         {% block left_panel %}
         <h3 class="hd">{% trans "Files" %}</h3>
         <ul class="side-tabnav-tabs">
diff --git a/seahub/templates/nav_footer.html b/seahub/templates/nav_footer.html
index 95efc8a92a..b7248468d6 100644
--- a/seahub/templates/nav_footer.html
+++ b/seahub/templates/nav_footer.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <a href="{{SITE_ROOT}}help/" target="_blank">{% trans "Help" %}</a>
 <a href="#" class="js-about">{% trans "About" %}</a>
-<a href="{% url 'download_client' %}" class="fright"><span aria-hidden="true" class="sf2-icon-monitor"></span> Clients</a>
+<a href="{% url 'download_client' %}" class="fright"><span aria-hidden="true" class="sf2-icon-monitor vam"></span> <span class="vam">{% trans "Clients" %}</span></a>
 
 <div class="about-content hide">
     <h3>{% trans "About" %}</h3>
diff --git a/seahub/templates/sysadmin/base.html b/seahub/templates/sysadmin/base.html
index 03165921ed..88742e047d 100644
--- a/seahub/templates/sysadmin/base.html
+++ b/seahub/templates/sysadmin/base.html
@@ -7,7 +7,7 @@
 
 {% block main_content %}
 <div class="row">
-    <div id="side-nav" class="side-tabnav col-md-3">
+    <div id="side-nav" class="side-nav side-tabnav col-md-3">
         {% block left_panel %}
         <h3 class="hd">{% trans "System Admin" %}</h3>
         <ul class="side-tabnav-tabs">
diff --git a/seahub/templates/sysadmin/sysadmin_backbone.html b/seahub/templates/sysadmin/sysadmin_backbone.html
index f748a6e495..711a662bca 100644
--- a/seahub/templates/sysadmin/sysadmin_backbone.html
+++ b/seahub/templates/sysadmin/sysadmin_backbone.html
@@ -58,7 +58,7 @@
 
         <div id="main" class="clear container-fluid top-padding">
             <div class="row">
-                <div class="side-tabnav col-md-3 hide" id="side-nav" role="navigation"></div>
+                <div class="side-nav side-tabnav col-md-3 hide" id="side-nav" role="navigation"></div>
                 <div id="right-panel" class="col-md-9 col-md-offset-3">
                     {% block right_panel %}{% endblock %}
                 </div>