Move popups into service