removed unnecessary stuff
added infinite scrolling