Added Js and overall code clean up