rework popup integration