Refactored navigation feature