Added avatars, needs tweaking