Adding more per page and bug fix