Improve popups and make presenters more predictable
merge master
Merge pull request #555 from rdwallis/popups

make popups more predictable