Fixed issues & Add WelcomeActivity