Clean up NavBar