Udpated events definitions
Style fix`
Resize canvas appropriately
Merge remote-tracking branch 'origin/map_fixes'

* origin/map_fixes:
  Resize canvas appropriately
  Style fix`
  Udpated events definitions