SplashScreen change and bugs