Improvements to webform_civicrm forms