Change to indented syntax
Progress on infinite scroll, plus some additional little fixes
Add infinite scroll