More refactoring of product views
Fix pagination for product list