Refactor content.ejs. Split client js file from ejs
Merge branch 'working'