refactoring
refactoring+bugfix
implementing infinite scroll