removed infinite scroll (from this branch)