scroll fix and addition of scrollTo