Paginator component refactoring