Change NavView to be more decoupled