Fixed JS issues; add scroll
Merge branch 'master' into garett_new