Fixed infinite scroll + added indicator