switched up mapbox layer, cleaned up layer control