Added infinite scrolling still buggy