Improve infinite scroll rendering

Fix third point of #391