Pagination and other formatting changes