updated avatars to properly handle overflow