welcome page refactor