GUI Regrouping + Collection Thread Fix