Improve Pager control