JC-1627 Fixed some HTML errors