Streamlined JS, added scrollTo