Updated package.json and integrated most of the mockup changes in the ejs.