Added some changes to Splash and Index