Avatars and some improvements
Final With Avatars