overhaul of pagination class