Updated standards for js and html
Fixed merge conflicts