added avatars to notifications in a cleaner way