Important fixes for welcome screen