AvatarContainer improved for multiple avatars