Workaround to prevent the map drawing on top of the world button
Merge remote-tracking branch 'scrawl/mapfixes'