Improving layout and avatar size
Clean merge