Updated how splash screen works and fixed XML wwarnings
Merge branch 'fixingSplashScreen'