finished. Added infinite scrolling