Fix CiviCRM forms - labels and content