Moved the javascript code to a new file, with some minor fixes
Merge branch 'javascript-refactor-to-new-file' into develop