Improve paging controls