Flattening schema version to 1
Using the avatar from the profile.
Small fixes