added user list and admin functions