Add fixes for navigation bar rendering.
Bug fixes for NavigationItem rendering