Infinite Scroll + UI Additions

Merge infinite scrolling feature with Antony's UI additions.