added loading for the map so user isn't left waiting cluelessly
Merge branch 'krish-frontend'