Pagination is now reusable

Missing lines for other tables