Refactor NavigationView