FIX: Conformity HTML (v2)

More conformity.