Refractored Pagination Blocks