Refactor NavigationHelpers