Improve the UX and UI for the map. Closes #6