Added new buttons and pagination controls