Moves modifier to the scaffold instead of the pager component.

Moves modifier to the scaffold instead of the pager component. #7338