Milos dev

- Modified code to improve pagination