Switch some tags to CSS (HTML5 compliance)