HTML: improvements