more changes to popup and button