Refactor NavUrlsService