refactoring the navigation experience