Nav Refactor