Refactor code and add step for welcome page