Tweak to fix HTML structure