Refactored SelectPlanPopup