new map: improved popup handling, patch by flopp
Merge branch 'new-map' into next