Merge pull request #196 from jonezy/master

blergh
fixed callout z-index
Merge pull request #197 from shutter111/master

fixed callout z-index