Splash screen refactoring