Added page buttons and pagination