added list of all users, refactored following controller