Clean up build and add basic support for MapBox layers