Update to correct NavBar and sidebar