#19 and #20 Added page numbers and total number of rows