Continue refactoring navigation