Navigation refactor improvements