Infinite scrolling and some fixes