Merge pull request #361 from pgreyson/master

Tighten up the map layout per Umesh's request