Patch mapbox to ignore shift for dragging. Enable shift-click to remove.
Style tweaks.