Fix & improve HTML