Refactor into navigation and util services