Added avatars and other stuff