diff --git a/media/css/seahub.css b/media/css/seahub.css
index 3e493b41ef..2678a93ede 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -131,7 +131,7 @@
 .sf2-icon-x2:before { content:"\e01f"; }
 .sf2-icon-user2:before { content:"\e020"; }
 .sf2-icon-msgs2:before { content:"\e021"; }
-.sf2-icon-group-settings:before { content:"\e022"; }
+/*.sf2-icon-group-settings:before { content:"\e022"; }*/
 .sf2-icon-comment:before { content:"\e023"; }
 .sf2-icon-wiki2:before { content:"\e024"; }
 
@@ -656,7 +656,8 @@ textarea:-moz-placeholder {/* for FF */
 }
 .side-tabnav .grp-name { /*for 'group'*/
     display:inline-block;
-    width:130px;
+    max-width:130px;
+    font-weight:normal;
 }
 .side-tabnav-tabs {
     margin-bottom:1em;
diff --git a/seahub/group/templates/group/group_base.html b/seahub/group/templates/group/group_base.html
index de6bfe38a0..f8a537efa3 100644
--- a/seahub/group/templates/group/group_base.html
+++ b/seahub/group/templates/group/group_base.html
@@ -10,7 +10,7 @@
 <div class="side-tabnav">
     <div class="hd w100 ovhd">
         <h3 class="fleft">
-        {% grp_avatar group.props.id 32 %} <span title="{{ group.group_name }}" class="grp-name ellipsis vam">{{ group.group_name }}</span>
+            {% grp_avatar group.props.id 32 %} <a title="{{ group.group_name }}" class="grp-name ellipsis vam" href="{% url 'group_info' group.id %}">{{ group.group_name }}</a>
         </h3>
     </div>
 </div>
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index db42028b0e..1ddf75488e 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -675,7 +675,7 @@
         <% if (wiki_enabled) { %>
         <span class="sf2-icon-wiki2 op-icon" title="{% trans "Wiki" %}" id="group-wiki-icon"></span>
         <% } %>
-        <span class="sf2-icon-cog1 op-icon" title="{% trans "Group Settings" %}" id="group-settings-icon"></span>
+        <span class="sf2-icon-cog1 op-icon" title="{% trans "Settings" %}" id="group-settings-icon"></span>
         <span class="sf2-icon-user2 op-icon" title="{% trans "Members" %}" id="group-members-icon"></span>
         <span class="sf2-icon-msgs2 op-icon" title="{% trans "Discussion" %}"></span>
     </div>
@@ -963,6 +963,11 @@
 <% } else if (is_admin) { %>
     <ul class="group-setting-list">
         <li class="group-setting-item" data-op="rename">{% trans "Rename" %}</li>
+        <% if (!wiki_enabled) { %>
+        <li class="group-setting-item" data-op="add-wiki">{% trans "Add Wiki" %}</li>
+        <% } else { %>
+        <li class="group-setting-item" data-op="remove-wiki">{% trans "Remove Wiki" %}</li>
+        <% } %>
     </ul>
     <ul class="last-group-setting-list">
         <li class="group-setting-item" data-op="import-members">{% trans "Import Members" %}</li>
diff --git a/seahub/templates/libraries.html b/seahub/templates/libraries.html
index 32b124a364..fcb9297bc8 100644
--- a/seahub/templates/libraries.html
+++ b/seahub/templates/libraries.html
@@ -164,7 +164,7 @@
         <div class="outer-caret up-outer-caret"><div class="inner-caret"></div></div>
         <div class="popover-hd ovhd">
             <span class="popover-close close sf2-icon-x1 op-icon fright" title="{% trans "Close" %}"></span>
-            <h3 class="popover-title">{% trans "Group Settings" %}</h3>
+            <h3 class="popover-title">{% trans "Settings" %}</h3>
         </div>
         <div class="popover-con">
             <div id="group-setting-con" class="hide"></div>
diff --git a/static/scripts/app/router.js b/static/scripts/app/router.js
index 077570fadf..25d4c8c95f 100644
--- a/static/scripts/app/router.js
+++ b/static/scripts/app/router.js
@@ -26,7 +26,6 @@ define([
             'group/:group_id/': 'showGroupRepos',
             'group/:group_id/lib/:repo_id(/*path)': 'showGroupRepoDir',
             'group/:group_id/members/': 'showGroupMembers',
-            'group/:group_id/settings/': 'showGroupSettings',
             'org/': 'showOrgRepos',
             'org/lib/:repo_id(/*path)': 'showOrgRepoDir',
             'common/lib/:repo_id(/*path)': 'showCommonDir',
@@ -190,11 +189,6 @@ define([
             this.groupView.showMembers();
         },
 
-        showGroupSettings: function(group_id) {
-            this.showGroupRepos(group_id);
-            this.groupView.showSettings();
-        },
-
         showOrgRepos: function() {
             this.switchCurrentView(this.orgView);
             this.orgView.showRepoList();
diff --git a/static/scripts/app/views/group-settings.js b/static/scripts/app/views/group-settings.js
index 2665d2ecec..b7632c23ff 100644
--- a/static/scripts/app/views/group-settings.js
+++ b/static/scripts/app/views/group-settings.js
@@ -77,12 +77,10 @@ define([
             this.$el.show();
             this.render();
             this.setConMaxHeight();
-            app.router.navigate('group/' + this.group.id + '/settings/');
         },
 
         hide: function() {
             this.$el.hide();
-            app.router.navigate('group/' + this.group.id + '/');
         },
 
         highlightItem: function(e) {