- Adding: Avatars
- Improving layout management