fix issue #616 Paginator prev/next and highlight current page

fixes the problems with paginator described in issue #616