Updated to current version

Not infinite scrolling anymore