Proposed improvements for pagenav

See README for details