Splash and main view controller refactored