Lots of design improvements and more work on the admin.users_controller