Added better pagination