scrollto working, content added
merge conflicts