Tweaking HTML structure slightly