Revert "Popups"

This reverts commit a680aa3585c3e7d8fb86b3f1c6b1ac00a2899870.
Revert "Revert "Popups""

This reverts commit 4fa7ee3a80f12d50a20511ace6b90a6cc369d6da.