diff --git a/multivariate.admin.inc b/multivariate.admin.inc
index 85aa119..379f7fc 100644
--- a/multivariate.admin.inc
+++ b/multivariate.admin.inc
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file
+ * Provides configuration for multivariate testing utility.
+ */
 
 /**
  * Override settings form.
@@ -6,29 +10,35 @@
 function multivariate_override_settings_form() {
   $form = array();
   $form['multivariate'] = array('#tree' => TRUE);
-  
+
   $tests = multivariate_load_multiple(FALSE);
-  foreach($tests as $test) {
-    $test_results = multivariate_get_results($test);
- 
-    $options = array('disable' => t('Disable override'));
-    foreach ($test_results as $mutation_id => $test_result) {
-      $options[$mutation_id] = $test_result['label'];
-    }
-    
-    $form['multivariate'][$test->mtid] = array(
-      '#type' => 'select',
-      '#title' => check_plain($test->title),
-      '#default_value' => isset($_COOKIE['multivariate_' . $test->mtid . '_override']) ? $_COOKIE['multivariate_' . $test->mtid . '_override'] : 'disable',
-      '#options' => $options,
+  if (empty($tests)) {
+    $form['multivariate']['notice'] = array(
+        '#markup' => t('There are currently no tests set up for testing. Go to !uri to set one up.', array('!uri' => l(t('multivariate/add'), 'multivariate/add'))),
     );
   }
-  
-  $form['submit'] = array(
-    '#type' => 'submit',
-    '#value' => t('Save')
-  );
+  else {
+    foreach ($tests as $test) {
+      $test_results = multivariate_get_results($test);
 
+      $options = array('disable' => t('Disable override'));
+      foreach ($test_results as $mutation_id => $test_result) {
+        $options[$mutation_id] = $test_result['label'];
+      }
+
+      $form['multivariate'][$test->mtid] = array(
+        '#type' => 'select',
+        '#title' => check_plain($test->title),
+        '#default_value' => isset($_COOKIE['multivariate_' . $test->mtid . '_override']) ? $_COOKIE['multivariate_' . $test->mtid . '_override'] : 'disable',
+        '#options' => $options,
+      );
+    }
+
+    $form['submit'] = array(
+      '#type' => 'submit',
+      '#value' => t('Save')
+    );
+  }
   return $form;
 }
 
@@ -37,7 +47,7 @@ function multivariate_override_settings_form() {
  */
 function multivariate_override_settings_form_submit($form, &$form_state) {
   global $cookie_domain;
-  
+
   foreach ($form_state['values']['multivariate'] as $mtid => $mutation_id) {
     if ($mutation_id == 'disable') {
       setcookie('multivariate_' . $mtid . '_override', '', REQUEST_TIME - 90000, '/', $cookie_domain);
@@ -50,18 +60,18 @@ function multivariate_override_settings_form_submit($form, &$form_state) {
 
 /**
  * Returns html table of all multivariate tests.
- * 
+ *
  * @return string
  */
 function multivariate_list() {
   $tests = multivariate_load_multiple(FALSE);
-  
+
   $header = array(
     t('Title'),
     t('Status'),
     t('Actions'),
   );
-  
+
   $rows = array();
   foreach ($tests as $mtid => $test) {
     $uri = entity_uri('multivariate_test', $test);
@@ -73,7 +83,7 @@ function multivariate_list() {
   }
 
   // @todo - add pager?
-  
+
   return theme('table', array(
     'header' => $header,
     'rows' => $rows,
@@ -121,16 +131,15 @@ function multivariate_form($form, &$form_state, $test) {
   );
 
   form_load_include($form_state, 'inc', 'multivariate', 'multivariate.admin');
-  
+
   $form['settings'] = array(
     '#type' => 'vertical_tabs',
   );
-  
+
   multivariate_conditions_fieldset($test, $form, $form_state);
   multivariate_variants_sets_fieldset($test, $form, $form_state);
   multivariate_success_conditions_fieldset($test, $form, $form_state);
-  
-//  field_attach_form('example_task', $study, $form, $form_state);
+
 
   $submit = array();
   if (!empty($form['#submit'])) {
@@ -148,7 +157,7 @@ function multivariate_form($form, &$form_state, $test) {
   );
 
   // Show Delete button if we are editing test.
-  $test_id = entity_id('multivariate_test' ,$test);
+  $test_id = entity_id('multivariate_test' , $test);
   if (!empty($test_id) && multivariate_access('edit', $test)) {
     $form['actions']['delete'] = array(
       '#type' => 'submit',
@@ -165,7 +174,7 @@ function multivariate_form($form, &$form_state, $test) {
   $form['#attached']['css'] = array(
     drupal_get_path('module', 'multivariate') . '/multivariate.css',
   );
-  
+
   return $form;
 }
 
@@ -181,7 +190,7 @@ function multivariate_form_validate($form, &$form_state) {
     // error but he will also see old run conditions (that he deleted) - they
     // are deleted from cache but because form is not valid it will not be
     // submited and user will see old conditions.
-    // That is why we will just show warning message for now and not trigger 
+    // That is why we will just show warning message for now and not trigger
     // validation error.
     // form_set_error('run_condition_fieldset', t('You didn\'t define run conditions.'));
     drupal_set_message(t("Note that you didn't define run conditions."), 'warning');
@@ -201,14 +210,14 @@ function multivariate_form_submit($form, &$form_state) {
   $test = $form_state['multivariate_test'];
 
   entity_form_submit_build_entity('multivariate_test', $test, $form, $form_state);
-  
+
   // Clean our entity from form values that we do not need.
   unset($test->run_condition['add-button']);
-  foreach($test->variants_set as &$set) {
+  foreach ($test->variants_set as &$set) {
     unset($set['variants_number_control_wrapper']);
     unset($set['add_mutation_control']);
-    foreach($set['variants'] as &$variant) {
-      foreach($variant['mutations'] as $mkey => &$mutation) {
+    foreach ($set['variants'] as &$variant) {
+      foreach ($variant['mutations'] as $mkey => &$mutation) {
         unset($mutation['remove']);
         if (empty($mutation)) {
           // This means that mutation plugin do not exist any more, so lets
@@ -225,7 +234,7 @@ function multivariate_form_submit($form, &$form_state) {
       unset($test->success_condition[$sckey]);
     }
   }
-  
+
   // Get run conditions from ctools cache.
   if ($run_condition = multivariate_ctools_access_get('run_condition')) {
     $test->run_condition += $run_condition[0];
@@ -238,6 +247,11 @@ function multivariate_form_submit($form, &$form_state) {
   drupal_set_message(t('Multivariate test %title saved.', array('%title' => entity_label('multivariate', $test))));
 }
 
+/**
+ * Multivariate form submit
+ * @param array $form
+ * @param array $form_state
+ */
 function multivariate_form_submit_delete($form, &$form_state) {
   $test_uri = entity_uri('multivariate_test', $form_state['multivariate_test']);
   $form_state['redirect'] = $test_uri['path'] . '/delete';
@@ -249,7 +263,7 @@ function multivariate_form_submit_delete($form, &$form_state) {
 function multivariate_delete_form($form, &$form_state, $test) {
   $form_state['multivariate_test'] = $test;
   // Always provide entity id in the same form key as in the entity edit form.
-  $form['multivariate_id'] = array('#type' => 'value', '#value' => entity_id('multivariate_test' ,$test));
+  $form['multivariate_id'] = array('#type' => 'value', '#value' => entity_id('multivariate_test' , $test));
   $task_uri = entity_uri('multivariate_test', $test);
   return confirm_form($form,
     t('Are you sure you want to delete multivariate test %title?', array('%title' => entity_label('multivariate_test', $test))),
@@ -324,7 +338,7 @@ function multivariate_change_variants_number_submit($form, &$form_state) {
   $diff = $new_variants_num - $vnum;
   if ($diff < 0) {
     // Remove variants - start from end of variants array.
-    for($i = 0; $i < -$diff; ++$i) {
+    for ($i = 0; $i < -$diff; ++$i) {
       unset($form_state['multivariate_test']->variants_set[$set_id]['variants'][$vnum - $i - 1]);
     }
   }
@@ -334,11 +348,11 @@ function multivariate_change_variants_number_submit($form, &$form_state) {
     foreach ($form_state['values']['variants_set'][$set_id]['variants'][0]['mutations'] as $mutation) {
       $variant_clone['mutations'][]['plugin'] = $mutation['plugin'];
     }
-    for($i = 0; $i < $diff; ++$i) {
+    for ($i = 0; $i < $diff; ++$i) {
       $form_state['multivariate_test']->variants_set[$set_id]['variants'][] = $variant_clone;
     }
   }
-  
+
   $form_state['rebuild'] = TRUE;
 }
 
@@ -365,7 +379,7 @@ function multivariate_remove_set_submit($form, &$form_state) {
 function multivariate_add_mutation_submit($form, &$form_state) {
   $set_id = $form_state['clicked_button']['#set_id'];
   $mutation_plugin = $form_state['values']['variants_set'][$set_id]['add_mutation_control']['select_mutation'];
-  // We don't have validation is some plugin really selected in select element 
+  // We don't have validation is some plugin really selected in select element
   // so we will check here.
   if ($mutation_plugin) {
     $variants =& $form_state['multivariate_test']->variants_set[$set_id]['variants'];
@@ -394,7 +408,7 @@ function multivariate_remove_mutation_submit($form, &$form_state) {
  */
 function multivariate_add_success_condition_submit($form, &$form_state) {
   $sc_plugin = $form_state['values']['add_success_condition_control']['success_condition_plugin'];
-  // We don't have validation is some plugin really selected in select element 
+  // We don't have validation is some plugin really selected in select element
   // so we will check here.
   if ($sc_plugin) {
     $form_state['multivariate_test']->success_condition[] = array('plugin' => $sc_plugin);
@@ -425,16 +439,16 @@ function multivariate_conditions_fieldset($test, &$form, $form_state) {
     '#group' => 'settings',
     '#weight' => 0,
   );
-  
+
   // If we are not in form submit this means we come to do form for the first
   // time so lets clear ctools cache we are using.
   if (!$form_state['submitted']) {
     multivariate_ctools_access_clear('run_condition');
   }
-  
+
   // Check if we have run conditions in ctools cache.
   if ($cache = multivariate_ctools_access_get('run_condition') && !empty($cache[0])) {
-    $access = $cache[0];    
+    $access = $cache[0];
   }
   // If cache is empty lets then check if test has run conditions.
   elseif (isset($test->run_condition['plugins'])) {
@@ -444,7 +458,7 @@ function multivariate_conditions_fieldset($test, &$form, $form_state) {
   else {
     $access = array();
   }
-  
+
   ctools_include('context-access-admin');
   $form_state += array(
     'access' => $access,
@@ -458,7 +472,7 @@ function multivariate_conditions_fieldset($test, &$form, $form_state) {
   );
   $run_condition_form = array();
   $run_condition_fieldset['run_condition'] = ctools_access_admin_form($run_condition_form, $form_state);
-  // This is also needed so ctools_access_admin_form() select box will not 
+  // This is also needed so ctools_access_admin_form() select box will not
   // overwrite node type info in our $form_state.
   $run_condition_fieldset['run_condition']['#tree'] = TRUE;
 
@@ -467,10 +481,10 @@ function multivariate_conditions_fieldset($test, &$form, $form_state) {
 
 /**
  * Helper function for adding sets fieldset to multivariate test edit form.
- * 
+ *
  * @param object $test
  * @param array $form
- * @param array $form_state 
+ * @param array $form_state
  */
 function multivariate_variants_sets_fieldset($test, &$form, $form_state) {
   $plugins_info = multivariate_api_info('mutation');
@@ -498,7 +512,7 @@ function multivariate_variants_sets_fieldset($test, &$form, $form_state) {
     '#suffix' => '</div>',
     '#tree' => TRUE
   );
-  
+
   foreach ($test->variants_set as $set_id => $set) {
     $sets_fieldset['variants_set'][$set_id] = array(
       '#type' => 'fieldset',
@@ -506,7 +520,7 @@ function multivariate_variants_sets_fieldset($test, &$form, $form_state) {
       '#title' => t('Set !num: @title', array('!num' => $set_id + 1, '@title' => $set['title'])),
     );
     $set_element =& $sets_fieldset['variants_set'][$set_id];
-    
+
     $set_element['title'] = array(
       '#type' => 'textfield',
       '#title' => t('Title'),
@@ -514,7 +528,7 @@ function multivariate_variants_sets_fieldset($test, &$form, $form_state) {
     );
 
     $variants_num = count($set['variants']);
-    
+
     // Variants number control.
     $set_element['variants_number_control_show'] = array(
       '#prefix' => '<div class="variants-number-control-show">',
@@ -525,7 +539,7 @@ function multivariate_variants_sets_fieldset($test, &$form, $form_state) {
           '!num' => $variants_num,
           '!change' => '<a href="#" class="variant-change">' . t('change') . '</a>',
         )
-      ),  
+      ),
     );
     $set_element['variants_number_control_wrapper'] = array(
       '#prefix' => '<div class="variants-number-control">',
@@ -550,10 +564,10 @@ function multivariate_variants_sets_fieldset($test, &$form, $form_state) {
       '#validate' => array('multivariate_change_variants_number_validate'),
       '#submit' => array('multivariate_change_variants_number_submit'),
     );
-    
+
     // Add variants.
     $set_element['variants'] = array(
-      '#prefix' => '<div id="set-' . $set_id .'-variants">',
+      '#prefix' => '<div id="set-' . $set_id . '-variants">',
       '#suffix' => '</div>',
     );
     $variant_id = 0;
@@ -613,7 +627,7 @@ function multivariate_variants_sets_fieldset($test, &$form, $form_state) {
       $set_element['variants'][$variant_id] = $variant_element;
       ++$variant_id;
     }
-    
+
     // Add new mutation control.
     $options = array(t('select mutation plugin'));
     foreach ($plugins_info as $key => $value) {
@@ -640,7 +654,7 @@ function multivariate_variants_sets_fieldset($test, &$form, $form_state) {
       '#submit' => array('multivariate_add_mutation_submit'),
     );
 
-    // There should be always be at least one set, so don't add remove button 
+    // There should be always be at least one set, so don't add remove button
     // for first set.
     if ($set_id > 0) {
       $set_element['remove'] = array(
@@ -657,10 +671,10 @@ function multivariate_variants_sets_fieldset($test, &$form, $form_state) {
         '#submit' => array('multivariate_remove_set_submit'),
       );
     }
-    
+
     ++$set_id;
   }
-  
+
   // Adding new set.
   $sets_fieldset['add_set'] = array(
     '#type' => 'submit',
@@ -677,12 +691,12 @@ function multivariate_variants_sets_fieldset($test, &$form, $form_state) {
 }
 
 /**
- * Helper function for adding success conditions  fieldset to multivariate 
+ * Helper function for adding success conditions  fieldset to multivariate
  * study node edit form.
- * 
+ *
  * @param object $test
  * @param array $form
- * @param array $form_state 
+ * @param array $form_state
  */
 function multivariate_success_conditions_fieldset($test, &$form, $form_state) {
   $plugins_info = multivariate_api_info('success_condition');
@@ -703,14 +717,14 @@ function multivariate_success_conditions_fieldset($test, &$form, $form_state) {
     $form['settings']['success_condition_fieldset'] = $success_condition_fieldset;
     return;
   }
-  
+
   // Create all sets plugin form elements.
   $success_condition_fieldset['success_condition'] = array(
     '#prefix' => '<div id="success-conditions">',
     '#suffix' => '</div>',
     '#tree' => TRUE,
   );
-  
+
   $sc_count = count($test->success_condition);
   foreach ($test->success_condition as $sc_id => $success_condition) {
     $element = array();
@@ -738,9 +752,8 @@ function multivariate_success_conditions_fieldset($test, &$form, $form_state) {
       '#submit' => array('multivariate_remove_success_condition_submit'),
     );
     $success_condition_fieldset['success_condition'][$sc_id] = $element;
-//    ++$sc_id;
   }
-  
+
   // Control for adding new success condition.
   $options[] = t('select new condition');
   foreach ($plugins_info as $key => $value) {
@@ -766,6 +779,6 @@ function multivariate_success_conditions_fieldset($test, &$form, $form_state) {
       '#submit' => array('multivariate_add_success_condition_submit'),
     ),
   );
-  
+
   $form['settings']['success_condition_fieldset'] = $success_condition_fieldset;
 }
diff --git a/multivariate.info b/multivariate.info
index d0a6cf2..61d3549 100644
--- a/multivariate.info
+++ b/multivariate.info
@@ -8,3 +8,4 @@ dependencies[] = ctools
 dependencies[] = entity
 
 files[] = multivariate.controller.inc
+configure = admin/config/multivariate
\ No newline at end of file