Improve new option for WorldMap layout