diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/templates/group-index.hbs
index 86a35b11122..a58ed87a3c4 100644
--- a/app/assets/javascripts/discourse/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/group-index.hbs
@@ -1,7 +1,3 @@
-{{group-membership-button model=model
-    createNewMessageViaParams='createNewMessageViaParams'
-    showLogin='showLogin'}}
-
 {{#if hasMembers}}
   {{#load-more selector=".group-members tr" action="loadMore"}}
     <table class='group-members'>
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 571c1813d6e..95fcabb36a7 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -29,17 +29,25 @@
     {{/if}}
   </div>
 
-  {{#mobile-nav class='group-nav' desktopClass="nav nav-pills" currentPath=application.currentPath}}
-    {{#each getTabs as |tab|}}
-      <li>
-        {{#link-to tab.location model title=tab.message}}
-          {{#if tab.icon}}{{fa-icon tab.icon}}{{/if}}
-          {{tab.message}}
-          {{#if tab.count}}<span class='count'>({{tab.count}})</span>{{/if}}
-        {{/link-to}}
-      </li>
-    {{/each}}
-  {{/mobile-nav}}
+  <div class="list-controls">
+    <div class="container">
+      {{#mobile-nav class='group-nav' desktopClass="nav nav-pills" currentPath=application.currentPath}}
+        {{#each getTabs as |tab|}}
+          <li>
+            {{#link-to tab.location model title=tab.message}}
+              {{#if tab.icon}}{{fa-icon tab.icon}}{{/if}}
+              {{tab.message}}
+              {{#if tab.count}}<span class='count'>({{tab.count}})</span>{{/if}}
+            {{/link-to}}
+          </li>
+        {{/each}}
+      {{/mobile-nav}}
+
+      {{group-membership-button model=model
+        createNewMessageViaParams='createNewMessageViaParams'
+        showLogin='showLogin'}}
+    </div>
+  </div>
 
   <div class='group-outlet'>
     {{outlet}}
diff --git a/app/assets/stylesheets/mobile/group.scss b/app/assets/stylesheets/mobile/group.scss
index cfbb849340b..ded66e71845 100644
--- a/app/assets/stylesheets/mobile/group.scss
+++ b/app/assets/stylesheets/mobile/group.scss
@@ -20,6 +20,7 @@
 
 .group-nav.mobile-nav {
   margin-bottom: 15px;
+  float: left;
 }
 
 .group-activity {
@@ -29,7 +30,7 @@
 .group-activity-nav.mobile-nav {
   position: absolute;
   right: 0px;
-  top: -50px;
+  top: -55px;
 }
 
 .group-activity-outlet {