Nav Refactoring