Refactored the navigation into a navigationService to minimize load on apis