move js scripts to bottom of view
merge conflicts