Finished adding pagination