New improved pagination with modified page count added.