Some cleanup
Popup-source opens on tap instead of mousedown for now.