Start of MapBox changes, for 2-layer maps