Map styles improved