Layout
Merge
Updated avatars everywhere