pulled js to main page.
Merge branch 'javascript-refactor'