Fix how avatars are handled
Refactor avatars to work better