diff --git a/airtime_mvc/application/forms/AddUser.php b/airtime_mvc/application/forms/AddUser.php
index 8d9029013..d87650126 100644
--- a/airtime_mvc/application/forms/AddUser.php
+++ b/airtime_mvc/application/forms/AddUser.php
@@ -105,7 +105,7 @@ class Application_Form_AddUser extends Zend_Form
         $this->addElement($select);
 
         $saveBtn = new Zend_Form_Element_Button('save_user');
-        $saveBtn->setAttrib('class', 'btn btn-small right-floated');
+        $saveBtn->setAttrib('class', 'btn right-floated');
         $saveBtn->setIgnore(true);
         $saveBtn->setLabel(_('Save'));
         $this->addElement($saveBtn);
diff --git a/airtime_mvc/public/css/redmond/jquery-ui-1.8.8.custom.css b/airtime_mvc/public/css/redmond/jquery-ui-1.8.8.custom.css
index 06709e695..f54d499dc 100644
--- a/airtime_mvc/public/css/redmond/jquery-ui-1.8.8.custom.css
+++ b/airtime_mvc/public/css/redmond/jquery-ui-1.8.8.custom.css
@@ -221,6 +221,11 @@
 	height: 16px;
 	background-image: url(images/ui-icons_ffffff_256x240.png);
 }
+.selected .ui-icon {
+	width: 16px;
+	height: 16px;
+	background-image: url(images/ui-icons_454545_256x240.png);
+}
 .ui-widget-content .ui-icon {
 	background-image: url(images/ui-icons_ffffff_256x240.png);
 }
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 07924c533..54b89fc24 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -1793,14 +1793,16 @@ button, input {
     border: 0px;
 }
 
-#users_datatable_wrapper > div.fg-toolbar.ui-toolbar.ui-widget-header.ui-corner-bl.ui-corner-br.ui-helper-clearfix
-{
+#users_datatable_wrapper > div.fg-toolbar.ui-toolbar.ui-widget-header.ui-corner-bl.ui-corner-br.ui-helper-clearfix {
     position: absolute;
     left: 0;
     right: 0;
     bottom: 0;
 }
 
+#users_datatable_wrapper td {
+    vertical-align: middle;
+}
 
 .user-management div.user-list-wrapper .ui-widget-header:first-child {
     background: none repeat scroll 0 0 transparent;
@@ -1816,7 +1818,8 @@ button, input {
     padding-bottom: 12px;
 }
 .user-management .dataTables_filter input {
-    width: 93.8%;
+    width: 100%;
+    box-sizing: border-box;
     margin-bottom:8px;
 }
 .user-data.simple-formblock dd {
@@ -3843,7 +3846,7 @@ li .ui-state-hover {
 }
 
 #users_datatable_wrapper {
-    position: absolute;
+    /*position: absolute;*/
     min-height: 300px;
 }
 
diff --git a/airtime_mvc/public/js/airtime/user/user.js b/airtime_mvc/public/js/airtime/user/user.js
index a959e7840..e277d4266 100644
--- a/airtime_mvc/public/js/airtime/user/user.js
+++ b/airtime_mvc/public/js/airtime/user/user.js
@@ -180,17 +180,17 @@ function assignUserRightsToUserTypes() {
         }
     });
 }
-$(document).ready(function() {
-    populateUserTable();
-    assignUserRightsToUserTypes();
 
-    $('#type').live("change", function(){
+function init() {
+    var type = $('#type');
+
+    type.live("change", function(){
         //when the title changes on live tipsy tooltips the changes take
         //affect the next time tipsy is shown so we need to hide and re-show it
         $(this).tipsy('hide').tipsy('show');
     });
-    
-    $('#type').tipsy({
+
+    type.tipsy({
         gravity: 'w',
         html: true,
         opacity: 0.9,
@@ -211,15 +211,21 @@ $(document).ready(function() {
         table.row('.selected').remove().draw( false );
     } );
 
-    $('#type').tipsy('show');
-    
+    type.tipsy('show');
+
     var newUser = {login:"", first_name:"", last_name:"", type:"G", id:""};
-    
+
     $('#add_user_button').live('click', function(){
         populateForm(newUser);
         $("#user_details").css("visibility", "visible");
     });
-    
+}
+
+$(document).ready(function() {
+    populateUserTable();
+    assignUserRightsToUserTypes();
+    init();
+
     $('#save_user').live('click', function(){
         var data = $('#user_form').serialize();
         var url = baseUrl+'User/add-user';
@@ -229,6 +235,7 @@ $(document).ready(function() {
                 $('#content').empty().append(json.html);
                 populateUserTable();
                 assignUserRightsToUserTypes();
+                init(); // Reinitialize
             } else {
                 //if form is invalid we only need to redraw the form
                 $('#user_form').empty().append($(json.html).find('#user_form').children());