Fix NavigationView
broken state after re-render
#259
+32
−13
Merged