added and improved user list