diff -uprb a/webform_alt_ui.module b/webform_alt_ui.module
--- webform_alt_ui.module	2013-04-09 15:19:00.000000000 +0200
+++ webform_alt_ui.module	2015-02-09 11:43:26.964592655 +0100
@@ -225,9 +219,6 @@ function webform_alt_ui_form_alter(&$for
     _webform_alt_ui_webform_email($form, $form_state);
     _webform_alt_ui_webform_form($form, $form_state);

-    // Disables extra palette.
-    $form['ui-wrapper']['live_preview']['#show_palette'] = FALSE;
-
     // Add validation and submission handlers. (Our custom validation must go
     // at the beginning, since it is responsible for adding some elements to
     // the $form_state['values'] array based on other form values which were
@@ -739,20 +709,19 @@ function _webform_alt_ui_add_submission_
     '#type' => 'textfield',
     '#title' => t('To'),
     '#default_value' => $existing_email ? $existing_email['email'] : variable_get('site_mail', ''),
+    '#states' => $dependent_on_checkbox,
   );
   $form['submission']['submission_email']['subject'] = array(
     '#type' => 'textfield',
     '#title' => t('Subject'),
     '#default_value' => $existing_email ? $existing_email['subject']: t('Webform submission received'),
+    '#states' => $dependent_on_checkbox,
   );
   $form['submission']['submission_email']['template'] = array(
     '#type' => 'textarea',
     '#title' => t('Body'),
     '#default_value' => $existing_email ? $existing_email['template'] : t('A visitor completed a webform on your site. Please visit your website and click the webform\'s "Results" tab to review the submission.'),
+    '#states' => $dependent_on_checkbox,
   );
   $form['#validate'][] = '_webform_alt_ui_validate_submission_email';

@@ -858,7 +827,7 @@ function _webform_alt_ui_webform_form(&$
   // Add a tab for Add field
   $form['add_field'] = array(
     '#type' => 'fieldset',
-    '#title' => 'Add field',
+    '#title' => 'Veld toevoegen',
     '#weight' => 1,
     '#group' => 'h-tabs',
   );
@@ -884,7 +853,7 @@ function _webform_alt_ui_webform_form(&$
   // Add a tab for Field settings
   $form['field_settings'] = array(
     '#type' => 'fieldset',
-    '#title' => 'Field settings',
+    '#title' => 'Veld instellingen',
     '#weight' => 2,
     '#group' => 'h-tabs',
   );
@@ -1273,20 +1235,11 @@ function webform_alt_ui_pre_process_prev
  *
  * This lets us tie in a form in the page generation process.
  */
-function webform_alt_ui_results_submissions($node, $user_filter, $pager_count) {
-  // This callback is invoked by node/NID/webform-results and by
-  // node/NID/submissions. The latter is available to people who may not have
-  // access to view all submissions for this webform, so protect the CSV file
-  // accordingly.
-  // @todo Might be a UI improvement for the form generated from
-  //   node/NID/submissions to trigger a CSV file that contains the current
-  //   user's submissions only, so that it matches what is displayed on the
-  //   page. However, webform_results_download() does not currently support
-  //   filters.
-  $form = webform_results_access($node) ? drupal_get_form('webform_alt_ui_result_buttons', $node) : array();
+function webform_alt_ui_results_submissions($node, $user_filter, $pager_count, $extra_filters = array()) {
+  $form = drupal_get_form('webform_alt_ui_result_buttons', $node, $user_filter, $extra_filters);

   module_load_include('inc', 'webform', 'includes/webform.report');
-  $page = webform_results_submissions($node, $user_filter, $pager_count);
+  $page = webform_results_submissions($node, $user_filter, $pager_count, $extra_filters);

   // Line up the page components in order.
   return array(array('#type' => 'markup', '#markup' => $page), $form);
@@ -1295,9 +1248,10 @@ function webform_alt_ui_results_submissi
 /**
  * Form for our overriden webforms result page.
  */
-function webform_alt_ui_result_buttons($form, &$form_state, $node) {
-  return array(
+function webform_alt_ui_result_buttons($form, &$form_state, $node, $user_filter, $extra_filters) {
+  $form = array(
     '#node' => $node,
+    '#user_filter' => $user_filter,
     'buttons' => array(
       'download' => array(
         '#type' => 'submit',
@@ -1306,21 +1260,37 @@ function webform_alt_ui_result_buttons($
       'clear' => array(
         '#type' => 'submit',
         '#value' => t('Clear'),
+        // @todo At some point, allow the user to clear just his or her own
+        //   submissions. Until then, remove the Clear button from the page
+        //   where the user is only viewing own submissions.
+        '#access' => !$user_filter,
       ),
     )
   );
+
+  $form_state['extra_filters'] = $extra_filters;
+
+  return $form;
 }

 /**
  * Form submission for our overriden webforms result page.
  */
 function webform_alt_ui_result_buttons_submit($form, &$form_state) {
+  global $user;
+
+  if (!empty($form_state['values']['op'])) {
   if ($form_state['values']['op'] == $form_state['values']['clear']) {
     $form_state['redirect'] = 'node/' . $form['#node']->nid . '/webform-results/clear';
   }
   elseif ($form_state['values']['op'] == $form_state['values']['download']) {
     form_load_include($form_state, 'inc', 'webform', 'includes/webform.report');
-    webform_results_download($form['#node']);
+      $extra_filters = isset($form_state['extra_filters']) ? $form_state['extra_filters'] : array();
+      if ($form['#user_filter']) {
+        $extra_filters['uid'] = $user->uid;
+      }
+      webform_results_download($form['#node'], 'delimited', array(), $extra_filters);
+    }
   }
 }

@@ -1512,6 +1482,9 @@ function webform_alt_ui_form_webform_adm
   $form['components']['time']['#printed'] = TRUE;
   $form['components']['time']['#default_value'] = FALSE;

+  // Hide the email settings
+  $form['email']['#access'] = FALSE;
+
   // Retheme the table
   $form['#theme'] = array('webform_alt_ui_admin_settings');
 }
