added user avatars, further clean up