Refactor to add JQuery and conten scripts