Improve splash screen system even further!!