Refactoring / Added Mapbox Satelite