Navigation refactoring.