PIRATE-2279 - Fix the map control style and new build