Big refactor of map into navigation map