[WIP] Added avatars to users