Navigation refactored