Extracted PopUpListener to own class