[Client] Improved worldmap