diff --git a/webform_pay.component.inc b/webform_pay.component.inc
index 8e185b3..2647895 100644
--- a/webform_pay.component.inc
+++ b/webform_pay.component.inc
@@ -222,12 +222,28 @@ function _webform_render_pay($component, $value = NULL, $filter = TRUE) {
   if ($component['extra']['fieldset']) {
     $element['#type'] = 'fieldset';
     $element['#title'] = $filter ? _webform_filter_xss($component['name']) : $component['name'];
+    $element['#title_display'] = $component['extra']['title_display'] ? $component['extra']['title_display'] : NULL;
+    $element['#attributes'] = array('class' => 'webform-component-pay');
+    $element['#pre_render'] = array('webform_element_title_display', '_webform_pay_fieldset_prerender');
+  }
+  else {
+    // Wrap in the normal component wrapper if not a fieldset.
+    $element['#theme_wrappers'] = array('webform_element_wrapper');
+    $element['#post_render'] = array('webform_element_wrapper');
   }
 
   return $element;
 }
 
 /**
+ * Pre-render function to set a fieldset ID.
+ */
+function _webform_pay_fieldset_prerender($element) {
+  $element['#attributes']['id'] = 'webform-component-' . str_replace('_', '-', implode('--', array_slice($element['#parents'], 1)));
+  return $element;
+}
+
+/**
  * Implements _webform_submit_component().
  */
 function _webform_submit_pay($component, $value) {
diff --git a/webform_pay.module b/webform_pay.module
index ebe315f..18aeed2 100644
--- a/webform_pay.module
+++ b/webform_pay.module
@@ -16,6 +16,7 @@ function webform_pay_webform_component_info() {
     'description' => t('Accepts credit card information.'),
     'features' => array(
       'conditonal' => FALSE,
+      'title_inline' => FALSE,
     ),
     'file' => 'webform_pay.component.inc',
   );