HTML fixed
Merge branch 'CommentHaftor'