Reordered menu and popup for ease-of-use, fixed add-into-group, allowed add-multiple-files