Structure changes
Improved map rendering