Changed HTML structure