Changes to the paginator so that it displays everything correctly