Add Pagination + header change