Some patches on infinite scroll app