Pager and rows and refactoring