Refactor & add StartUpActivity