Add more styling to map
Merged with ykat