diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 4dd05fdef..3f14b2090 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -134,7 +134,7 @@ class GroupController extends AuthBackendController
             $removeForm->addElement('button', 'btn_submit', array(
                 'escape'        => false,
                 'type'          => 'submit',
-                'class'         => 'link-like spinner',
+                'class'         => 'link-button spinner',
                 'value'         => 'btn_submit',
                 'decorators'    => array('ViewHelper'),
                 'label'         => $this->view->icon('trash'),
diff --git a/application/views/scripts/group/show.phtml b/application/views/scripts/group/show.phtml
index 8d81683ee..fb850a2a5 100644
--- a/application/views/scripts/group/show.phtml
+++ b/application/views/scripts/group/show.phtml
@@ -23,90 +23,86 @@ if ($this->hasPermission('config/authentication/groups/edit') && $backend instan
 }
 
 ?>
-<div class="controls">
- <?php if (! $this->compact): ?>
-  <?= $tabs; ?>
- <?php endif ?>
-  <h2 class="clearfix"><?= $this->escape($group->group_name) ?><span class="pull-right"><?= $editLink ?></span></h2>
-  <table class="name-value-table">
-    <tr>
-      <th><?= $this->translate('Created at'); ?></th>
-      <td><?= $group->created_at === null ? '-' : $this->formatDateTime($group->created_at); ?></td>
-    </tr>
-    <tr>
-      <th><?= $this->translate('Last modified'); ?></th>
-      <td><?= $group->last_modified === null ? '-' : $this->formatDateTime($group->last_modified); ?></td>
-    </tr>
-  </table>
-  <h2><?= $this->translate('Members'); ?></h2>
+<div class="controls separated dont-print">
 <?php if (! $this->compact): ?>
-  <?= $this->sortBox; ?>
+    <?= $tabs; ?>
 <?php endif ?>
-  <?= $this->limiter; ?>
-  <?= $this->paginator; ?>
+    <h2 class="clearfix"><?= $this->escape($group->group_name) ?><span class="pull-right"><?= $editLink ?></span></h2>
+    <table class="name-value-table">
+        <tr>
+            <th><?= $this->translate('Created at'); ?></th>
+            <td><?= $group->created_at === null ? '-' : $this->formatDateTime($group->created_at); ?></td>
+        </tr>
+        <tr>
+            <th><?= $this->translate('Last modified'); ?></th>
+            <td><?= $group->last_modified === null ? '-' : $this->formatDateTime($group->last_modified); ?></td>
+        </tr>
+    </table>
 <?php if (! $this->compact): ?>
-  <?= $this->filterEditor; ?>
+    <h2><?= $this->translate('Members'); ?></h2>
+    <div class="grid">
+        <?= $this->limiter; ?>
+        <?= $this->paginator; ?>
+        <?= $this->sortBox; ?>
+    </div>
+    <?= $this->filterEditor; ?>
 <?php endif ?>
 </div>
-<div class="content members" data-base-target="_next">
+<div class="content">
 <?php if ($extensible): ?>
     <?= $this->qlink(
-        $this->translate('Add User to Group') ,
+        $this->translate('Add New Member'),
         'group/addmember',
-        null,
         array(
-            'class'             => 'button-link',
-            'data-base-target'  => '_next',
-            'icon'              => 'plus',
-            'title'             => $this->translate('Add user to group')
+            'backend'   => $backend->getName(),
+            'group'     => $group->group_name
+        ),
+        array(
+            'icon'  => 'plus',
+            'class' => 'button-link'
         )
     ) ?>
 <?php endif ?>
 
-<?php
-
-$firstRow = true;
-foreach ($members as $member): ?>
-<?php if ($firstRow): ?>
-  <?php $firstRow = false; ?>
-  <table data-base-target="_next" class="action-table listing-table">
-    <thead>
-      <tr>
-        <th class="member-name"><?= $this->translate('Username'); ?></th>
-       <?php if (isset($removeForm)): ?>
-        <th class="member-remove"><?= $this->translate('Remove'); ?></th>
-       <?php endif ?>
-      </tr>
-    </thead>
-    <tbody>
-  <?php endif ?>
-      <tr>
-        <td class="member-name">
-        <?php if (
-          $this->hasPermission('config/authentication/users/show')
-          && ($userBackend = $backend->getUserBackendName($member->user_name)) !== null
-        ): ?>
-          <?= $this->qlink($member->user_name, 'user/show', array(
-            'backend' => $userBackend,
-            'user'    => $member->user_name
-          ), array(
-            'title'   => sprintf($this->translate('Show detailed information about %s'), $member->user_name)
-          )); ?>
-        <?php else: ?>
-          <?= $this->escape($member->user_name); ?>
-        <?php endif ?>
-        </td>
-       <?php if (isset($removeForm)): ?>
-        <td class="icon-col" data-base-target="_self">
-          <?php $removeForm->getElement('user_name')->setValue($member->user_name); echo $removeForm; ?>
-        </td>
-       <?php endif ?>
-      </tr>
-<?php endforeach ?>
-<?php if ($members->hasResult()): ?>
-    </tbody>
-  </table>
-<?php else: ?>
+<?php if (! $members->hasResult()): ?>
   <p><?= $this->translate('No group member found matching the filter'); ?></p>
-<?php endif ?>
 </div>
+<?php return; endif ?>
+
+    <table data-base-target="_next" class="action-table listing-table">
+        <thead>
+            <tr>
+                <th><?= $this->translate('Username'); ?></th>
+            <?php if (isset($removeForm)): ?>
+                <th><?= $this->translate('Remove'); ?></th>
+            <?php endif ?>
+            </tr>
+        </thead>
+        <tbody>
+        <?php foreach ($members as $member): ?>
+            <tr>
+                <td>
+                <?php if (
+                    $this->hasPermission('config/authentication/users/show')
+                    && ($userBackend = $backend->getUserBackendName($member->user_name)) !== null
+                ): ?>
+                    <?= $this->qlink($member->user_name, 'user/show', array(
+                        'backend' => $userBackend,
+                        'user'    => $member->user_name
+                    ), array(
+                        'title'   => sprintf($this->translate('Show detailed information about %s'), $member->user_name)
+                    )); ?>
+                <?php else: ?>
+                    <?= $this->escape($member->user_name); ?>
+                <?php endif ?>
+                </td>
+            <?php if (isset($removeForm)): ?>
+                <td class="icon-col" data-base-target="_self">
+                    <?php $removeForm->getElement('user_name')->setValue($member->user_name); echo $removeForm; ?>
+                </td>
+            <?php endif ?>
+            </tr>
+        <?php endforeach ?>
+        </tbody>
+    </table>
+</div>
\ No newline at end of file
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 05c41ce62..0d0e92d23 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -256,33 +256,6 @@ div.content.groups {
   }
 }
 
-div.content.members {
-  table.member-list {
-    th.member-remove {
-      width: 8em;
-      padding-right: 0.5em;
-      text-align: right;
-    }
-
-    td.member-remove {
-      text-align: right;
-
-      form button.link-like {
-        color: inherit;
-      }
-    }
-  }
-
-  p {
-    margin-top: 0;
-  }
-
-  a.member-add {
-    display: block;
-    margin-top: 1em;
-  }
-}
-
 form.backend-selection {
   float: right;