iScroll changes

Still need to test