Actually fixed scrollto issues.
Moved all JS to single file.