More tweaks to HTML structure