Brought back paging, initial work on custom rows/columns count