Splash revamp fixes 2