Add improved pager