View.Nav refactoring