Fix HTML code
Merge branch '2.0'