fix bugs related to first time experience