Move JS out of view file
Merge branch 'feat-js-files' into develop