refactor WelcomeActivity