diff --git a/lang_dropdown.admin.js b/lang_dropdown.admin.js
deleted file mode 100755
index f22bef9..0000000
--- a/lang_dropdown.admin.js
+++ /dev/null
@@ -1,11 +0,0 @@
-(function ($) {
-Drupal.behaviors.betterMessagesSettingsSummary = {
-  attach: function (context) {
-    var wrapper = $('#lang-dropdown-js-widget-settings-wrapper');
-    ($('input#edit-js-widget:checked').length > 0) ? wrapper.show() : wrapper.css('display', 'none');
-    $('input#edit-js-widget').click(function() {
-      ($(this).is(':checked')) ? wrapper.slideDown() : wrapper.slideUp();
-    });
-  }
-};
-})(jQuery);
\ No newline at end of file
diff --git a/lang_dropdown.module b/lang_dropdown.module
index 2b950ff..0e89768 100755
--- a/lang_dropdown.module
+++ b/lang_dropdown.module
@@ -29,9 +29,6 @@ function lang_dropdown_block_configure($delta = '') {
     '#weight' => 0,
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
-    '#attached' => array(
-      'js' => array(drupal_get_path('module', 'lang_dropdown') . '/lang_dropdown.admin.js'),
-    ),
   );
   $form['lang_dropdown']['js_widget'] = array(
     '#type' => 'checkbox',
@@ -39,18 +36,19 @@ function lang_dropdown_block_configure($delta = '') {
     '#description' => t('This option is amazing with <a href="!href">Language icons</a> module.', array('!href' => 'http://drupal.org/project/languageicons')),
     '#default_value' => $settings['js_widget'],
   );
-  $form['lang_dropdown']['wrapper'] = array(
-    '#prefix' => '<div class="clear-block" id="lang-dropdown-js-widget-settings-wrapper">',
-    '#suffix' => '</div>',
-  );
   $num_rows = array(2, 3, 4, 5 , 6, 7, 8, 9, 10);
-  $form['lang_dropdown']['wrapper']['visible_rows'] = array(
+  $form['lang_dropdown']['visible_rows'] = array(
     '#type' => 'select',
     '#title' => t('Number of visible rows'),
     '#options' => array_combine($num_rows, $num_rows),
     '#default_value' => $settings['js_widget_settings']['visible_rows'],
+    '#states' => array(
+      'visible' => arrray(
+        ':input[name="js_widget"]' => array('checked' => TRUE),
+      ),
+    ),
   );
-  $form['lang_dropdown']['wrapper']['row_height'] = array(
+  $form['lang_dropdown']['row_height'] = array(
     '#type' => 'textfield',
     '#title' => t('Row height'),
     '#size' => 5,
@@ -58,8 +56,13 @@ function lang_dropdown_block_configure($delta = '') {
     '#required' => TRUE,
     '#field_suffix' => 'px',
     '#default_value' => $settings['js_widget_settings']['row_height'],
+    '#states' => array(
+      'visible' => arrray(
+        ':input[name="js_widget"]' => array('checked' => TRUE),
+      ),
+    ),
   );
-  $form['lang_dropdown']['wrapper']['width'] = array(
+  $form['lang_dropdown']['width'] = array(
     '#type' => 'textfield',
     '#title' => t('Width of dropdown element'),
     '#size' => 5,
@@ -67,12 +70,22 @@ function lang_dropdown_block_configure($delta = '') {
     '#required' => TRUE,
     '#field_suffix' => 'px',
     '#default_value' => $settings['js_widget_settings']['width'],
+    '#states' => array(
+      'visible' => arrray(
+        ':input[name="js_widget"]' => array('checked' => TRUE),
+      ),
+    ),
   );
-  $form['lang_dropdown']['wrapper']['animation'] = array(
+  $form['lang_dropdown']['animation'] = array(
     '#type' => 'select',
     '#title' => t('Animation style for dropdown'),
     '#options' => array('slideDown' => t('Slide down'), 'fadeIn' => t('Fade in')),
     '#default_value' => $settings['js_widget_settings']['animation'],
+    '#states' => array(
+      'visible' => arrray(
+        ':input[name="js_widget"]' => array('checked' => TRUE),
+      ),
+    ),
   );
 
   $form['languageicons'] = array(