Minor pagination class change and organization.