Mapbox embedding, embed plugin tidy up