Improve rendering of map