final fixes to change popup plugin