Making user avatar and some other changes