Merge pull request #309 from kmeurer/master

Major updates to Map View, small css changes
change to map file.