Fix paths names
Add avatars