diff --git a/jump.module b/jump.module
old mode 100644
new mode 100755
index 26dca7c..46a9311
--- a/jump.module
+++ b/jump.module
@@ -36,6 +36,39 @@ function jump_settings() {
     '#default_value' => variable_get('jump_activepageinmenu', 1),
     '#description' => t('This setting will force the jump menu to show the current page as the default selection in the jump menu when checked.  If you have a menu option that you would always like displayed at the top of the menu, like <em>Select a menu item</em>, you will want to uncheck this. This setting controls this behavior for all jump menus sitewide.  You can override this setting on a block-by-block basis.'),
   );
+  
+  $form['available_menus'] = array (
+    '#type' => 'fieldset',
+    '#title' => t('Available Menus'),
+  );  
+  
+  foreach (menu_get_menus() as $name => $title) {
+    $menuid = preg_replace('/-/','/_/',$name);
+    $form['available_menus']['jump_menu_'.$menuid] = array(
+      '#type' => 'checkbox',
+      '#title' => t("@title", array('@title' => $title)),
+      '#default_value' => variable_get('jump_menu_'.$menuid, 0),
+      '#description' => t('Create a Jump Levels block for @name', array('@name' => $name)),
+    );    
+  }
+  
+  $form['available_vocabs'] = array (
+    '#type' => 'fieldset',
+    '#title' => t('Available Vocabularies'),
+  );  
+  
+  $vocs = taxonomy_get_vocabularies();
+  foreach ($vocs as $vid => $vocabulary) {
+    $form['available_vocabs']['jump_vocab_'.$vid] = array(
+      '#type' => 'checkbox',
+      '#title' => t("@vocabulary", array('@vocabulary' => $vocabulary->name)),
+      '#default_value' => variable_get('jump_vocab_'.$vid, 0),
+      '#description' => t('Create a Jump Levels block for @vocabulary', array('@vocabulary' => $vocabulary->name)),
+    );      
+    
+  }  
+
+  
   return system_settings_form($form);
 }
 
@@ -51,18 +84,23 @@ function jump_block($op = 'list', $delta = 0, $edit = array()) {
   switch ($op) {
     case 'list':
       $blocks = array();
-      foreach (menu_get_menus() as $name => $title) {
-        $blocks['menu-' . $name] = array(
-          'info' => t('Jump menu: !menu', array('!menu' => $name))
-        );
-      }
+        foreach (menu_get_menus() as $name => $title) {
+          $menuid = preg_replace('/-/','/_/',$name);
+          if (variable_get('jump_menu_'.$menuid, 0) == 1){
+            $blocks['menu-'. $name] = array(
+              'info' => t('Jump Levels menu: !menu', array('!menu' => $name))
+            );
+          }
+        }
 
-      $vocs = taxonomy_get_vocabularies();
-      foreach ($vocs as $vid => $vocabulary) {
-        $blocks['taxo-' . $vid] = array(
-          'info' => t('Jump menu: !voc', array('!voc' => $vocabulary->name))
-        );
-      }
+        $vocs = taxonomy_get_vocabularies();
+        foreach ($vocs as $vid => $vocabulary) {
+          if (variable_get('jump_vocab_'.$vid, 0) == 1){
+            $blocks['taxo-'. $vid] = array(
+              'info' => t('Jump Levels menu: !voc', array('!voc' => $vocabulary->name))
+            );
+          }
+        }
       return $blocks;
     case 'configure':
       $form = array();