Tie base layer options to layerswitcher, better naming conventions for map elements