Merge pull request #649 from brooksryba/develop

Style
events for map
Merge pull request #650 from Tendrid/develop

events for map