Did some improvement to infinite scroll