Improve map usability

Improve usability of map by moving controls, and remove clutter from map
display. Changed tabs to spaces in a few locations.