Clean up of the navigation bar