Refactored navigation