Updated NavBar and Splash