Update Pagination - final touches