cancel reorder on image change, fixed focus issues, fixed crash for dialog cancel and back