Add user avatar, clean up