Improved and fixes user avatar
Updated
Cosmetic
Removed deprecated
Merge Master