added scrollTo for nav
merge js