Changes needed for movable rows with grouped headers