Removed SortGroupModal and replaced it with SortModal