NavBar Customizations Cleanup