Improve popups and make presenters more predictable