chore: refactoring navigation code much more slim