fixed pagination, added custom Paginator