nav views refactoring