Refactor code and add Welcome Page step