welcome page refactoring