diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 6160c40ae..d080c1dae 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -162,8 +162,7 @@ class UserController extends AuthBackendController
         $form->setRepository($backend);
         $form->add()->handleRequest();
 
-        $this->view->form = $form;
-        $this->render('form');
+        $this->renderForm($form, $this->translate('New User'));
     }
 
     /**
@@ -185,8 +184,7 @@ class UserController extends AuthBackendController
             $this->httpNotFound(sprintf($this->translate('User "%s" not found'), $userName));
         }
 
-        $this->view->form = $form;
-        $this->render('form');
+        $this->renderForm($form, $this->translate('Update User'));
     }
 
     /**
@@ -208,8 +206,7 @@ class UserController extends AuthBackendController
             $this->httpNotFound(sprintf($this->translate('User "%s" not found'), $userName));
         }
 
-        $this->view->form = $form;
-        $this->render('form');
+        $this->renderForm($form, $this->translate('Remove User'));
     }
 
     /**
diff --git a/application/views/scripts/simple-form.phtml b/application/views/scripts/simple-form.phtml
index 954edc263..9bcba74e2 100644
--- a/application/views/scripts/simple-form.phtml
+++ b/application/views/scripts/simple-form.phtml
@@ -2,5 +2,5 @@
     <?= $tabs ?>
 </div>
 <div class="content">
-    <?= $form->setTitle(null) ?>
+    <?= $form->create()->setTitle(null) // @TODO(el): create() has to be called because the UserForm is setting the title there ?>
 </div>
diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index 6cc110628..c6b2b4ae4 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -29,11 +29,17 @@ $extensible = $this->hasPermission('config/authentication/users/add') && $backen
 $reducible = $this->hasPermission('config/authentication/users/remove') && $backend instanceof Reducible;
 ?>
 <?php if ($extensible): ?>
-    <?= $this->qlink($this->translate('Add a new user'), 'user/add', array('backend' => $backend->getName()), array(
-        'icon'                => 'plus',
-        'data-base-target'    => '_next',
-        'class'               => 'action-link button'
-    )) ?>
+    <?= $this->qlink(
+        $this->translate('Add a New User') ,
+        'user/add',
+        array('backend' => $backend->getName()),
+        array(
+            'class'             => 'button-link',
+            'data-base-target'  => '_next',
+            'icon'              => 'plus',
+            'title'             => $this->translate('Create a new user')
+        )
+    ) ?>
 <?php endif ?>
     <table class="action-table listing-table" data-base-target="_next">
     <thead>
@@ -59,7 +65,7 @@ $reducible = $this->hasPermission('config/authentication/users/remove') && $back
                 )
             ) ?></td>
         <?php if ($reducible): ?>
-            <td><?= $this->qlink(
+            <td class="icon-col"><?= $this->qlink(
                 null,
                 'user/remove',
                 array(
@@ -67,8 +73,9 @@ $reducible = $this->hasPermission('config/authentication/users/remove') && $back
                     'user'      => $user->user_name
                 ),
                 array(
-                    'title'     => sprintf($this->translate('Remove user %s'), $user->user_name),
-                    'icon'      => 'cancel'
+                    'class' => 'action-link',
+                    'icon'  => 'cancel',
+                    'title' => sprintf($this->translate('Remove user %s'), $user->user_name)
                 )
             ) ?></td>
             <?php endif ?>
diff --git a/application/views/scripts/user/show.phtml b/application/views/scripts/user/show.phtml
index a5b9850e1..ee3aa6809 100644
--- a/application/views/scripts/user/show.phtml
+++ b/application/views/scripts/user/show.phtml
@@ -26,8 +26,8 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
 <?php if (! $this->compact): ?>
   <?= $tabs; ?>
 <?php endif ?>
-  <h1><?= $this->escape($user->user_name); ?><span class="pull-right"><?= $editLink; ?></span></h1>
-  <table class="avp user-header">
+  <h2 class="clearfix"><?= $this->escape($user->user_name) ?><span class="pull-right"><?= $editLink ?></span></h2>
+  <table class="name-value-table">
     <tr>
       <th><?= $this->translate('State'); ?></th>
       <td><?= $user->is_active === null ? '-' : ($user->is_active ? $this->translate('Active') : $this->translate('Inactive')); ?></td>
@@ -52,13 +52,26 @@ if ($this->hasPermission('config/authentication/users/edit') && $backend instanc
 <?php endif ?>
 </div>
 <div class="content memberships">
+    <?php if ($showCreateMembershipLink): ?>
+    <?= $this->qlink(
+        $this->translate('Add User to Group') ,
+        'user/createmembership',
+        array('backend' => $backend->getName()),
+        array(
+            'class'             => 'button-link',
+            'data-base-target'  => '_next',
+            'icon'              => 'plus',
+            'title'             => $this->translate('Add user to user group')
+        )
+    ) ?>
+    <?php endif ?>
 <?php
-
+// @TODO(el): Remove that $firstRow thingy
 $firstRow = true;
 foreach ($memberships as $membership): ?>
 <?php if ($firstRow): ?>
   <?php $firstRow = false; ?>
-  <table data-base-target="_next" class="action membership-list alternating">
+  <table data-base-target="_next" class="action-table listing-table">
     <thead>
       <tr>
         <th class="membership-group"><?= $this->translate('Group'); ?></th>
@@ -98,19 +111,4 @@ foreach ($memberships as $membership): ?>
 <?php else: ?>
   <p><?= $this->translate('No memberships found matching the filter'); ?></p>
 <?php endif ?>
-<?php if ($showCreateMembershipLink): ?>
-<?= $this->qlink(
-  $this->translate('Create New Membership'),
-  'user/createmembership',
-  array(
-    'backend'   => $backend->getName(),
-    'user'      => $user->user_name
-  ),
-  array(
-    'icon'              => 'plus',
-    'data-base-target'  => '_next',
-    'class'             => 'membership-create'
-  )
-); ?>
-<?php endif ?>
-</div>
\ No newline at end of file
+</div>