Add pagination and amend post