WIP: refactored navigation