Nav cleanup and refactoring