CRM-14378 - Fix invalid markup and add descriptive classes to custom data