added endless scroll & code cleanup