#364 Rework chat layouts + add avatars