Integrated and moved the basemap section.