Fix pagination class

- Also add credit for boone