added avatars
added placeholder
merged conflicts