diff --git a/js/ds.js b/js/ds.js
index 86df348..2d6e907 100644
--- a/js/ds.js
+++ b/js/ds.js
@@ -65,47 +65,42 @@ $.fn.dsCtoolsContentConfiguration = function (configuration) {
  */
 Drupal.behaviors.settingsToggle = {
   attach: function (context) {
-
-    if ($('.ft-link').length == 0) {
-      return;
-    }
-
-    // Remove click from link.
-    $('.ft-link').click(function(e) {
+        
+    // Bind on click.
+    $(context).find('#field-display-overview').find('.ft-link').once('ds-ft').bind('click', function(e) {
+      
       e.preventDefault();
-    });
-
-    // Bind update button.
-    $('#field-display-overview .ft-update').click(function() {
-
-      // Close the settings.
-      var settings = $(this).parents('.field-template');
-      settings.hide();
-      $(this).parents('tr').removeClass('field-formatter-settings-editing');
-
-      // Check the label.
-      var row = $(this).parents('tr');
-      var label = $('.label-change', settings).val();
-      var original = $('.original-label', row).val();
-      if (label != '') {
-        new_label = label + ' (Original: ' + original + ')<input type="hidden" class="original-label" value="' + original + '">';
-        $('.field-label-row', row).html(new_label);
-      }
-      else {
-        new_label = original + '<input type="hidden" class="original-label" value="' + original + '">';
-        $('.field-label-row', row).html(new_label);
-      }
-      return false;
-    });
+      
+      var fieldTemplate = $(this).next();
+      
+      // Bind update button.
+      fieldTemplate.find('.ft-update').click(function() {
+  
+        // Close the settings.
+        var settings = $(this).parents('.field-template');
+        settings.hide();
+        $(this).parents('tr').removeClass('field-formatter-settings-editing');
+  
+        // Check the label.
+        var row = $(this).parents('tr');
+        var label = $('.label-change', settings).val();
+        var original = $('.original-label', row).val();
+        if (label != '') {
+          new_label = label + ' (Original: ' + original + ')<input type="hidden" class="original-label" value="' + original + '">';
+          $('.field-label-row', row).html(new_label);
+        }
+        else {
+          new_label = original + '<input type="hidden" class="original-label" value="' + original + '">';
+          $('.field-label-row', row).html(new_label);
+        }
+        return false;
+      });      
 
-    // Bind on field template select button.
-    $('.ds-extras-field-template').change(function() {
-      ds_show_expert_settings(this);
-    });
+      // Bind on field template select button.
+      fieldTemplate.find('.ds-extras-field-template').change(function() {
+        ds_show_expert_settings(this);
+      })
     
-    // Add click event to field settings link.
-    $('.ft-link').click(function() {
-
       $(this).parents('tr').siblings().removeClass('field-formatter-settings-editing');
       $(this).parents('tr').addClass('field-formatter-settings-editing');
 
diff --git a/modules/ds_extras/ds_extras.admin.inc b/modules/ds_extras/ds_extras.admin.inc
index 7ddc762..f523d19 100644
--- a/modules/ds_extras/ds_extras.admin.inc
+++ b/modules/ds_extras/ds_extras.admin.inc
@@ -332,12 +332,6 @@ function ds_extras_field_ui_alter(&$form, &$form_state) {
       $wrappers = array(
         'lb' => array(
           'title' => t('Label'),
-            'states' => array(
-            'invisible' => array(
-              'select[name="fields[' . $key . '][label]"]' => array('value' => 'hidden'),
-              'select[name="fields[' . $key . '][format][ft][function]"]' => array('value' => 'theme_ds_field_expert'),
-            ),
-          ),
         ),
         'ow' => array('title' => t('Outer wrapper')),
         'fis' => array('title' => t('Field items')),
@@ -356,11 +350,6 @@ function ds_extras_field_ui_alter(&$form, &$form_state) {
             '#attributes' => array(
               'class' => array('colon-checkbox'),
             ),
-            '#states' => array(
-              'invisible' => array(
-                'select[name="fields[' . $key . '][label]"]' => array('value' => 'hidden'),
-              ),
-            ),
           );
           $colon_checkbox = TRUE;
         }
@@ -371,9 +360,6 @@ function ds_extras_field_ui_alter(&$form, &$form_state) {
           '#prefix' => '<div class="ft-group ' . $wrapper_key . '">',
           '#default_value' => isset($field_settings[$key]['ft'][$wrapper_key]) ? TRUE : FALSE,
         );
-        if (isset($value['states'])) {
-          $form['fields'][$key]['format']['ft'][$wrapper_key]['#states'] = $value['states'];
-        }
         $form['fields'][$key]['format']['ft'][$wrapper_key . '-el'] = array(
           '#type' => 'textfield',
           '#title' => t('Element'),
@@ -381,9 +367,6 @@ function ds_extras_field_ui_alter(&$form, &$form_state) {
           '#description' => t('E.g. div, span, h2 etc.'),
           '#default_value' => isset($field_settings[$key]['ft'][$wrapper_key . '-el']) ? $field_settings[$key]['ft'][$wrapper_key . '-el'] : '',
         );
-        if (isset($value['states']) && $wrapper_key == 'lb') {
-          $form['fields'][$key]['format']['ft'][$wrapper_key . '-el']['#states'] = $value['states'];
-        }
         $classes = array(
           'field-name-' . strtr($key, '_', '-'),
         );
@@ -395,9 +378,6 @@ function ds_extras_field_ui_alter(&$form, &$form_state) {
           '#default_value' => isset($field_settings[$key]['ft'][$wrapper_key . '-cl']) ? $field_settings[$key]['ft'][$wrapper_key . '-cl'] : '',
           '#description' => t('Classes: !classes', array('!classes' => implode(', ', $classes))),
         );
-        if (isset($value['states'])) {
-          $form['fields'][$key]['format']['ft'][$wrapper_key . '-cl']['#states'] = $value['states'];
-        }
       }
 
       $form['fields'][$key]['format']['ft']['update'] = array(
@@ -410,11 +390,6 @@ function ds_extras_field_ui_alter(&$form, &$form_state) {
 
       // Another label needs some other stuff.
       unset($form['fields'][$key]['format']['ft']['lb']['#description']);
-      $form['fields'][$key]['format']['ft']['lb']['#states'] = array(
-        'invisible' => array(
-          'select[name="fields[' . $key . '][label]"]' => array('value' => 'hidden'),
-        )
-      );
       $form['fields'][$key]['format']['ft']['lb']['#type'] = 'textfield';
       $form['fields'][$key]['format']['ft']['lb']['#size'] = '10';
       $form['fields'][$key]['format']['ft']['lb']['#attributes'] = array('class' => array('label-change'));