page numbering improvements