diff --git a/media/css/seahub.css b/media/css/seahub.css
index 44fdeb97c2..f5989c0f09 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -205,7 +205,7 @@ input {
 input, button { display:inline-block;/*for ie*/ }
 input[type=text],
 input[type=password] {
-    height:22px;
+    height:26px;
 }
 button,
 input[type=submit],
@@ -1294,7 +1294,7 @@ button.sf-dropdown-toggle:focus {
     border-top: 1px solid #c9c9c9;
 }
 .msg-input {
-    width:350px;
+    width:362px;
     padding:3px 5px;
 }
 .msg-form .submit {
diff --git a/seahub/profile/templates/profile/profile_base.html b/seahub/profile/templates/profile/profile_base.html
index b97e5dfa27..067f0f6a8d 100644
--- a/seahub/profile/templates/profile/profile_base.html
+++ b/seahub/profile/templates/profile/profile_base.html
@@ -1,4 +1,4 @@
-{% extends "myhome_base.html" %}
+{% extends "base.html" %}
 {% load i18n %}
 
 {% block title %}{% trans "Profile Setting" %}{% endblock %}
diff --git a/seahub/profile/templates/profile/set_profile.html b/seahub/profile/templates/profile/set_profile.html
index 6d722f0776..1f7c97d74a 100644
--- a/seahub/profile/templates/profile/set_profile.html
+++ b/seahub/profile/templates/profile/set_profile.html
@@ -1,11 +1,13 @@
-{% extends "myhome_base.html" %}
+{% extends "base.html" %}
 {% load avatar_tags i18n %}
 {% load url from future %}
 
 {% block sub_title %}{% trans "Settings" %} - {% endblock %}
 
-{% block left_panel %}
-<div class="side-textnav">
+{% block main_content %}
+<div class="row">
+
+<div class="side-tabnav side-textnav col-md-3 hide" 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>
@@ -15,9 +17,9 @@
         <li class="tab"><a href="#del-account">{% trans "Delete Account" %}</a></li>
     </ul>
 </div>
-{% endblock %}
 
-{% block right_panel %}
+<div id="right-panel" class="col-md-9 col-md-offset-3">
+
 <h2>{% trans "Settings" %}</h2>
 
 <div id="user-basic-info" class="setting-item">
@@ -113,6 +115,9 @@
     <button class="simplemodal-close">{% trans "Cancel"%}</button>
 </form>
 
+</div> <!-- right-panel -->
+</div> <!-- row -->
+
 {% endblock %}
 
 {% block extra_script %}