Continue adjusting paginator. Still wip though!