Get 3.x file differences

and other changes to popup