diff --git a/media/css/seahub.css b/media/css/seahub.css
index 65c0527c5c..949630dc04 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -1038,6 +1038,11 @@ textarea:-moz-placeholder {/* for FF */
     -moz-transition: all 0.3s ease;
     transition: all 0.3s ease;
 }
+@media (max-width:400px) {
+    .right-side-panel {
+        width:100%;
+    }
+}
 .right-side-panel-hd {
     background:#f8f8f8;
     padding:10px;
@@ -1053,6 +1058,7 @@ textarea:-moz-placeholder {/* for FF */
 .right-side-panel-footer {
     position:absolute;
     bottom:0;
+    width:100%;
 }
 /**** messages ****/
 .messages {
@@ -1567,7 +1573,7 @@ button.sf-dropdown-toggle:focus {
     border-top: 1px solid #c9c9c9;
 }
 .msg-input {
-    width:336px;
+    width:100%;
     padding:3px 5px;
     height:60px;
 }
diff --git a/static/scripts/app/views/dir.js b/static/scripts/app/views/dir.js
index 3add5ee90b..9e0cc595fc 100644
--- a/static/scripts/app/views/dir.js
+++ b/static/scripts/app/views/dir.js
@@ -169,10 +169,24 @@ define([
             reset: function() {
                 this.renderPath();
                 this.renderDirOpBar();
+
+                this.$el_con.show();
+
                 if (this.view_mode == 'list') {
                     this.renderDirentsHd();
                 }
 
+                this.$dirent_grid.empty();
+                this.$dirent_list_body.empty();
+
+                if (this.view_mode == 'list') {
+                    this.$dirent_list.show();
+                    this.$dirent_grid.hide();
+                } else {
+                    this.$dirent_list.hide();
+                    this.$dirent_grid.show();
+                }
+
                 // sort
                 Common.updateSortIconByMode({'context': this.$el});
                 this.sortDirents();
@@ -343,18 +357,8 @@ define([
             renderDir: function() {
                 this.$loading_tip.show();
                 this.$error.hide();
-                this.$el_con.show();
+                this.$el_con.hide();
 
-                this.$dirent_grid.empty();
-                this.$dirent_list_body.empty();
-
-                if (this.view_mode == 'list') {
-                    this.$dirent_list.show();
-                    this.$dirent_grid.hide();
-                } else {
-                    this.$dirent_list.hide();
-                    this.$dirent_grid.show();
-                }
 
                 var _this = this;
                 var thumbnail_size = app.pageOptions.thumbnail_default_size;
diff --git a/static/scripts/app/views/group-settings.js b/static/scripts/app/views/group-settings.js
index fdb5677146..fd602e8b6e 100644
--- a/static/scripts/app/views/group-settings.js
+++ b/static/scripts/app/views/group-settings.js
@@ -144,7 +144,7 @@ define([
             var _this = this;
 
             var $form = $(this.transferTemplate());
-            $form.modal({focus:false});
+            $form.modal({focus:false, minWidth:268});
             $('#simplemodal-container').css({'width':'auto', 'height':'auto'});
 
             $('[name="email"]', $form).select2($.extend(