Fixed minor things with pagination