Refactoring navigation