Rewrite HTML ,fix #1