diff --git semantic_cck.module semantic_cck.module
index f875635..8b0f6e8 100644
--- semantic_cck.module
+++ semantic_cck.module
@@ -25,7 +25,7 @@ function semantic_cck_settings_form($field, $type) {
 
   $form['semantic_html_fieldset'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Semantic HTML Output'),
+    '#title' => t('Semantic CCK settings'),
     '#collapsible' => TRUE,
     '#collapsed' => ($settings['semantic_cck_use_semantic_output']) ? FALSE : TRUE,
     '#weight' => 3,
@@ -33,7 +33,7 @@ function semantic_cck_settings_form($field, $type) {
   );
   $form['semantic_html_fieldset']['semantic_cck_field_element'] = array(
     '#type' => 'textfield',
-    '#title' => t('Surround the entire field with'),
+    '#title' => t('Field wrapping element'),
     '#description' => t('Insert the desired <abbr title="Hyper Text Markup Language">HTML</abbr> element that will be the container for the entire field. Leave blank for no surrounding element.'),
     '#default_value' => isset($settings['semantic_cck_field_element']) ? $settings['semantic_cck_field_element'] : 'div',
     '#required' => FALSE,
@@ -41,75 +41,21 @@ function semantic_cck_settings_form($field, $type) {
   );
   $form['semantic_html_fieldset']['semantic_cck_field_class'] = array(
     '#type' => 'textfield',
-    '#title' => t('Choose field element class(es)'),
+    '#title' => t('Field element class(es)'),
     '#description' => t('The field element automatically gets field, field type and specific field classes (ie. <em>field field-type-text field-field-my-field-name</em>).'),
     '#default_value' => isset($settings['semantic_cck_field_class']) ? $settings['semantic_cck_field_class'] : '',
     '#required' => FALSE,
   );
-  $form['semantic_html_fieldset']['label_fieldset'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Field Label'),
-    '#description' => t('The label automatically gets a class of <em>field-label</em>. <strong>Please note that the placement or appearance of the label is still determined by the CCK !display_fields_settings.</strong>', array('!display_fields_settings' => l(t('Display fields settings'), 'admin/content/node-type/'.str_replace("_","-",$type).'/display'))),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
-    '#attributes' => array('class' => 'semantic-cck-labels'),
-  );
-  $form['semantic_html_fieldset']['label_fieldset']['above'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Labels Above Field Value(s)'),
-    '#description' => t('How to render the label when located above the field value(s).'),
-    '#collapsible' => FALSE,
-    '#collapsed' => FALSE,
-    '#attributes' => array('class' => 'semantic-cck-labels-above'),
-  );
-  $form['semantic_html_fieldset']['label_fieldset']['above']['semantic_cck_label_element_above'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Label element'),
-    '#description' => t('Insert the desired <abbr title="Hyper Text Markup Language">HTML</abbr> element that will surround the label. Leave blank for no surrounding element.'),
-    '#default_value' => isset($settings['semantic_cck_label_element_above']) ? $settings['semantic_cck_label_element_above'] : 'h3',
-    '#required' => FALSE,
-    '#size' => 20,
-  );
-  $form['semantic_html_fieldset']['label_fieldset']['above']['semantic_cck_label_suffix_above'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Label suffix'),
-    '#description' => t('Insert the desired suffix character.'),
-    '#default_value' => isset($settings['semantic_cck_label_suffix_above']) ? $settings['semantic_cck_label_suffix_above'] : '',
-    '#required' => FALSE,
-  );
-  $form['semantic_html_fieldset']['label_fieldset']['inline'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Inline Labels'),
-    '#description' => t('How to render the label when located inline with the field value(s).'),
-    '#collapsible' => FALSE,
-    '#collapsed' => FALSE,
-    '#attributes' => array('class' => 'semantic-cck-labels-inline'),
-  );
-  $form['semantic_html_fieldset']['label_fieldset']['inline']['semantic_cck_label_element_inline'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Label element'),
-    '#description' => t('Insert the desired <abbr title="Hyper Text Markup Language">HTML</abbr> element that will surround the label. Leave blank for no surrounding element.'),
-    '#default_value' => isset($settings['semantic_cck_label_element_inline']) ? $settings['semantic_cck_label_element_inline'] : 'span',
-    '#required' => FALSE,
-    '#size' => 20,
-  );
-  $form['semantic_html_fieldset']['label_fieldset']['inline']['semantic_cck_label_suffix_inline'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Label suffix'),
-    '#description' => t('Insert the desired suffix character'),
-    '#default_value' => isset($settings['semantic_cck_label_suffix_inline']) ? $settings['semantic_cck_label_suffix_inline'] : ':',
-    '#required' => FALSE,
-  );
   $form['semantic_html_fieldset']['items_fieldset'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Field Value(s)'),
+    '#title' => t('Value(s)'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
     '#attributes' => array('class' => 'semantic-cck-multiple-values'),
   );
   $form['semantic_html_fieldset']['items_fieldset']['multivalue'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Multiple Value Field'),
+    '#title' => t('Multiple values (Suggestion: remove this fieldset)'),
     '#collapsible' => FALSE,
     '#collapsed' => FALSE,
     '#attributes' => array('class' => 'field-values'),
@@ -123,7 +69,7 @@ function semantic_cck_settings_form($field, $type) {
   );
   $form['semantic_html_fieldset']['items_fieldset']['multivalue']['items_element']['semantic_cck_multiple_items_element'] = array(
     '#type' => 'textfield',
-    '#title' => t('Surround all field values with'),
+    '#title' => t('Element surrounding all values'),
     '#description' => t('Insert the desired <abbr title="Hyper Text Markup Language">HTML</abbr> element that will be the container for all field values. Leave blank for no surrounding element.'),
     '#default_value' => isset($settings['semantic_cck_multiple_items_element']) ? $settings['semantic_cck_multiple_items_element'] : 'div',
     '#required' => FALSE,
@@ -131,7 +77,7 @@ function semantic_cck_settings_form($field, $type) {
   );
   $form['semantic_html_fieldset']['items_fieldset']['multivalue']['items_element']['semantic_cck_multiple_items_class'] = array(
     '#type' => 'textfield',
-    '#title' => t('And a class of'),
+    '#title' => t('Class(es)'),
     '#description' => t('The surrounding fields element automatically gets the <em>field-items</em> class.'),
     '#default_value' => isset($settings['semantic_cck_multiple_items_class']) ? $settings['semantic_cck_multiple_items_class'] : '',
     '#required' => FALSE,
@@ -144,7 +90,7 @@ function semantic_cck_settings_form($field, $type) {
 	);
   $form['semantic_html_fieldset']['items_fieldset']['multivalue']['item_element']['semantic_cck_multiple_item_element'] = array(
     '#type' => 'textfield',
-    '#title' => t('Surround each field value with'),
+    '#title' => t('Element for each value'),
     '#description' => t('Insert the desired <abbr title="Hyper Text Markup Language">HTML</abbr> element that will be the container for each field value. Leave blank for no surrounding element.'),
     '#default_value' => isset($settings['semantic_cck_multiple_item_element']) ? $settings['semantic_cck_multiple_item_element'] : 'div',
     '#required' => FALSE,
@@ -152,14 +98,14 @@ function semantic_cck_settings_form($field, $type) {
   );
   $form['semantic_html_fieldset']['items_fieldset']['multivalue']['item_element']['semantic_cck_multiple_item_class'] = array(
     '#type' => 'textfield',
-    '#title' => t('And a class of'),
+    '#title' => t('Class(es)'),
     '#description' => t('Each field instance automatically gets the <em>field-item</em> class. Insert a # where you want enumeration (ie field-item-#).'),
     '#default_value' => isset($settings['semantic_cck_multiple_item_class']) ? $settings['semantic_cck_multiple_item_class'] : '',
     '#required' => FALSE,
   );
   $form['semantic_html_fieldset']['items_fieldset']['singlevalue'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Single Value Field'),
+    '#title' => t('Special single-value settings'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
     '#attributes' => array('class' => 'semantic-cck-single-values-settings'),
@@ -167,7 +113,7 @@ function semantic_cck_settings_form($field, $type) {
   $form['semantic_html_fieldset']['items_fieldset']['singlevalue']['semantic_cck_use_singlevalue_settings'] = array(
     '#type' => 'checkbox',
     '#title' => t('Use the following settings when the field contains only one value'),
-    '#description' => t('Leave this unchecked to use multiple value field settings when the field contains only one value.'),
+    '#description' => t('Check this option to use settings below for single-value fields and multiple-value fields with only one entry.'),
     '#return_value' => 1,
     '#default_value' => isset($settings['semantic_cck_use_singlevalue_settings']) ? $settings['semantic_cck_use_singlevalue_settings'] : 0,
     '#required' => FALSE,
@@ -181,7 +127,7 @@ function semantic_cck_settings_form($field, $type) {
   );
   $form['semantic_html_fieldset']['items_fieldset']['singlevalue']['singlevalues']['semantic_cck_single_item_element'] = array(
     '#type' => 'textfield',
-    '#title' => t('Surround field value with'),
+    '#title' => t('Element for value'),
     '#description' => t('Insert the desired <abbr title="Hyper Text Markup Language">HTML</abbr> element that will be the container for a single field value. Leave blank for no surrounding element.'),
     '#default_value' => isset($settings['semantic_cck_single_item_element']) ? $settings['semantic_cck_single_item_element'] : 'div',
     '#required' => FALSE,
@@ -189,7 +135,7 @@ function semantic_cck_settings_form($field, $type) {
   );
   $form['semantic_html_fieldset']['items_fieldset']['singlevalue']['singlevalues']['semantic_cck_single_item_class'] = array(
     '#type' => 'textfield',
-    '#title' => t('And a class of'),
+    '#title' => t('Class(es)'),
     '#default_value' => isset($settings['semantic_cck_single_item_class']) ? $settings['semantic_cck_single_item_class'] : '',
     '#description' => t('The field instance will automatically get a <em>field-item</em> class.'),
     '#required' => FALSE,
@@ -227,6 +173,60 @@ function semantic_cck_settings_form($field, $type) {
     '#default_value' => isset($settings['semantic_cck_striping_classes']) ? $settings['semantic_cck_striping_classes'] : 'odd even',
     '#required' => FALSE,
   );
+  $form['semantic_html_fieldset']['label_fieldset'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Label'),
+    '#description' => t('The label automatically gets a class of <em>field-label</em>. <strong>Please note that the placement or appearance of the label is still determined by the CCK !display_fields_settings.</strong>', array('!display_fields_settings' => l(t('Display fields settings'), 'admin/content/node-type/'.str_replace("_","-",$type).'/display'))),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
+    '#attributes' => array('class' => 'semantic-cck-labels'),
+  );
+  $form['semantic_html_fieldset']['label_fieldset']['above'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Label above field value(s)'),
+    '#description' => t('Settings when rendering the label above the field value(s).'),
+    '#collapsible' => FALSE,
+    '#collapsed' => FALSE,
+    '#attributes' => array('class' => 'semantic-cck-labels-above'),
+  );
+  $form['semantic_html_fieldset']['label_fieldset']['above']['semantic_cck_label_element_above'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Label element'),
+    '#description' => t('Insert the desired <abbr title="Hyper Text Markup Language">HTML</abbr> element that will surround the label. Leave blank for no surrounding element.'),
+    '#default_value' => isset($settings['semantic_cck_label_element_above']) ? $settings['semantic_cck_label_element_above'] : 'h3',
+    '#required' => FALSE,
+    '#size' => 20,
+  );
+  $form['semantic_html_fieldset']['label_fieldset']['above']['semantic_cck_label_suffix_above'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Label suffix'),
+    '#description' => t('Insert the desired suffix character. CCK default is colon.'),
+    '#default_value' => isset($settings['semantic_cck_label_suffix_above']) ? $settings['semantic_cck_label_suffix_above'] : '',
+    '#required' => FALSE,
+  );
+  $form['semantic_html_fieldset']['label_fieldset']['inline'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Inline labels'),
+    '#description' => t('Settings when rendering the label inline with the field value(s).'),
+    '#collapsible' => FALSE,
+    '#collapsed' => FALSE,
+    '#attributes' => array('class' => 'semantic-cck-labels-inline'),
+  );
+  $form['semantic_html_fieldset']['label_fieldset']['inline']['semantic_cck_label_element_inline'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Label element'),
+    '#description' => t('Insert the desired <abbr title="Hyper Text Markup Language">HTML</abbr> element that will surround the label. Leave blank for no surrounding element.'),
+    '#default_value' => isset($settings['semantic_cck_label_element_inline']) ? $settings['semantic_cck_label_element_inline'] : 'span',
+    '#required' => FALSE,
+    '#size' => 20,
+  );
+  $form['semantic_html_fieldset']['label_fieldset']['inline']['semantic_cck_label_suffix_inline'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Label suffix'),
+    '#description' => t('Insert the desired suffix character. CCK default is colon.'),
+    '#default_value' => isset($settings['semantic_cck_label_suffix_inline']) ? $settings['semantic_cck_label_suffix_inline'] : ':',
+    '#required' => FALSE,
+  );
 
   return $form;
 }
@@ -240,8 +240,8 @@ function semantic_cck_form_alter(&$form, $form_state, $form_id) {
     $additions = array();
     $additions['semantic_cck_use_semantic_output'] = array(
       '#type' => 'checkbox',
-      '#title' => t('Use Semantic HTML For Field Output'),
-      '#description' => t('Check this box to output the field using the Semantic HTML settings below. Leave this box unchecked to use default CCK field output.'),
+      '#title' => t('Use Semantic CCK for field output'),
+      '#description' => t('Check this box to output the field using the Semantic CCK settings below. Leave this box unchecked to use default CCK field output.'),
       '#return_value' => 1,
       '#default_value' => isset($field['semantic_cck_use_semantic_output']) ? $field['semantic_cck_use_semantic_output'] : 0,
       '#required' => FALSE,
@@ -249,8 +249,8 @@ function semantic_cck_form_alter(&$form, $form_state, $form_id) {
     );
     $additions['semantic_cck_use_semantic_instance'] = array(
       '#type' => 'checkbox',
-      '#title' => t('Use Semantic HTML Settings Below For This Instance Only'),
-      '#description' => t('Check this box to output the field using the Semantic HTML settings below <strong>only for this instance of the field</strong>.'),
+      '#title' => t('Override Semantic CCK settings for this field instance'),
+      '#description' => t('Check this box to output the field using the Semantic CCK settings below <strong>only for this instance of the field</strong>. Note that Semantic CCK output must be enabled for all instances of the field.'),
       '#return_value' => 1,
       '#default_value' => isset($field['widget']['semantic_cck_use_semantic_instance']) ? $field['widget']['semantic_cck_use_semantic_instance'] : 0,
       '#required' => FALSE,