Navigation refactor.