WIP cleaning up map page
Merge pull request #56 from eddyfh/master

WIP cleaning up map page