Fix borked elements (and become HTML5 compliant)