Small improvements
Merge branch 'SplashScreenService' into develop