Fixed up user list (still WIP)