diff --git a/src/YamlFormEntitySettingsForm.php b/src/YamlFormEntitySettingsForm.php
index 9116799..fd5f273 100644
--- a/src/YamlFormEntitySettingsForm.php
+++ b/src/YamlFormEntitySettingsForm.php
@@ -22,12 +22,12 @@ class YamlFormEntitySettingsForm extends EntityForm {
     $default_settings = $this->config('yamlform.settings')->get('settings');
     $settings = $yamlform->getSettings();
 
+    // General.
     $form['general'] = [
       '#type' => 'details',
       '#title' => $this->t('General settings'),
       '#open' => TRUE,
     ];
-
     $form['general']['id'] = [
       '#type' => 'item',
       '#title' => $this->t('ID'),
@@ -57,7 +57,15 @@ class YamlFormEntitySettingsForm extends EntityForm {
       '#access' => $this->moduleHandler->moduleExists('yamlform_templates'),
       '#default_value' => $yamlform->isTemplate(),
     ];
+    $form['general']['results_disabled'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Disable saving of submissions.'),
+      '#return_value' => TRUE,
+      '#description' => $this->t('If saving of submissions is disabled, submission settings, submission limits and the saving of drafts will be disabled.  Submissions must be sent via an email or handled using a custom <a href=":href">form handler</a>.', [':href' => Url::fromRoute('entity.yamlform.handlers_form', ['yamlform' => $yamlform->id()])->toString()]),
+      '#default_value' => $settings['results_disabled'],
+    ];
 
+    // Page.
     $form['page'] = [
       '#type' => 'details',
       '#title' => $this->t('Page settings'),
@@ -101,6 +109,7 @@ class YamlFormEntitySettingsForm extends EntityForm {
       ];
     }
 
+    // Form.
     $form['form'] = [
       '#type' => 'details',
       '#title' => $this->t('Form settings'),
@@ -121,7 +130,6 @@ class YamlFormEntitySettingsForm extends EntityForm {
           ':input[name="template"]' => ['checked' => FALSE],
         ],
       ],
-
     ];
     $form['form']['form_closed_message']  = [
       '#type' => 'yamlform_html_editor',
@@ -141,27 +149,10 @@ class YamlFormEntitySettingsForm extends EntityForm {
       '#size' => 20,
       '#default_value' => $settings['form_submit_label'],
     ];
-    $form['form']['form_confidential'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Confidential submissions'),
-      '#description' => $this->t('Confidential submissions have no recorded IP address and must be submitted while logged out.'),
-      '#return_value' => TRUE,
-      '#default_value' => $settings['form_confidential'],
-    ];
-    $form['form']['form_confidential_message']  = [
-      '#type' => 'yamlform_html_editor',
-      '#title' => $this->t('Form confidential message'),
-      '#description' => $this->t('A message to be displayed when authenticated users try to access a confidential form.'),
-      '#default_value' => $settings['form_confidential_message'],
-      '#states' => [
-        'visible' => [
-          ':input[name="form_confidential"]' => ['checked' => TRUE],
-        ],
-      ],
-    ];
     $form['form']['form_prepopulate'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Allow elements to be populated using query string parameters.'),
+      '#description' => $this->t("If checked, elements can be populated using query string parameters. For example, appending ?name=John+Smith to a form's URL would setting an the 'name' element's default value to 'John Smith'."),
       '#return_value' => TRUE,
       '#default_value' => $settings['form_prepopulate'],
     ];
@@ -195,6 +186,7 @@ class YamlFormEntitySettingsForm extends EntityForm {
       '#default_value' => $settings['form_autofocus'],
     ];
 
+    // Wizard.
     $form['wizard'] = [
       '#type' => 'details',
       '#title' => $this->t('Wizard settings'),
@@ -256,6 +248,7 @@ class YamlFormEntitySettingsForm extends EntityForm {
       ],
     ];
 
+    // Preview.
     $form['preview'] = [
       '#type' => 'details',
       '#title' => $this->t('Preview settings'),
@@ -301,10 +294,16 @@ class YamlFormEntitySettingsForm extends EntityForm {
       '#default_value' => $settings['preview_message'],
     ];
 
+    // Draft.
     $form['draft'] = [
       '#type' => 'details',
       '#title' => $this->t('Draft settings'),
       '#open' => TRUE,
+      '#states' => [
+        'visible' => [
+          ':input[name="results_disabled"]' => ['checked' => FALSE],
+        ],
+      ],
     ];
     $form['draft']['draft'] = [
       '#type' => 'checkbox',
@@ -348,99 +347,122 @@ class YamlFormEntitySettingsForm extends EntityForm {
       '#default_value' => $settings['draft_loaded_message'],
     ];
 
-    $form['confirmation'] = [
+    // Submission.
+    $form['submission'] = [
       '#type' => 'details',
-      '#title' => $this->t('Confirmation settings'),
+      '#title' => $this->t('Submission settings'),
       '#open' => TRUE,
-    ];
-    $form['confirmation']['confirmation_type'] = [
-      '#title' => $this->t('Confirmation type'),
-      '#type' => 'radios',
-      '#options' => [
-        'page' => $this->t('Page (redirects to new page and displays the confirmation message)'),
-        'inline' => $this->t('Inline (reloads the current page and replaces the form with the confirmation message.)'),
-        'message' => $this->t('Message (reloads the current page/form and displays the confirmation message at the top of the page.)'),
-        'url' => $this->t('URL (redirects to a custom path or URL)'),
-        'url_message' => $this->t('URL with message (redirects to a custom path or URL and displays the confirmation message at the top of the page.)'),
-      ],
-      '#default_value' => $settings['confirmation_type'],
-    ];
-
-    $form['confirmation']['confirmation_url'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Confirmation URL'),
-      '#description' => $this->t('URL to redirect the user to upon successful submission.'),
-      '#default_value' => $settings['confirmation_url'],
       '#states' => [
         'visible' => [
-          [':input[name="confirmation_type"]' => ['value' => 'url']],
-          'xor',
-          [':input[name="confirmation_type"]' => ['value' => 'url_message']],
+          ':input[name="results_disabled"]' => ['checked' => FALSE],
         ],
       ],
     ];
-
-    $form['confirmation']['confirmation_message'] = [
+    $form['submission']['form_confidential'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Confidential submissions'),
+      '#description' => $this->t('Confidential submissions have no recorded IP address and must be submitted while logged out.'),
+      '#return_value' => TRUE,
+      '#default_value' => $settings['form_confidential'],
+    ];
+    $form['submission']['form_confidential_message']  = [
       '#type' => 'yamlform_html_editor',
-      '#title' => $this->t('Confirmation message'),
-      '#description' => $this->t('Message to be shown upon successful submission.'),
-      '#default_value' => $settings['confirmation_message'],
+      '#title' => $this->t('Form confidential message'),
+      '#description' => $this->t('A message to be displayed when authenticated users try to access a confidential form.'),
+      '#default_value' => $settings['form_confidential_message'],
       '#states' => [
-        'invisible' => [
-          ':input[name="confirmation_type"]' => ['value' => 'url'],
+        'visible' => [
+          ':input[name="form_confidential"]' => ['checked' => TRUE],
         ],
       ],
     ];
 
-    $form['submission'] = [
+    // Limits.
+    $form['limits'] = [
       '#type' => 'details',
-      '#title' => $this->t('Submission settings'),
+      '#title' => $this->t('Submission limits'),
       '#open' => TRUE,
+      '#states' => [
+        'visible' => [
+          ':input[name="results_disabled"]' => ['checked' => FALSE],
+        ],
+      ],
     ];
-    $form['submission']['limit_total'] = [
+    $form['limits']['limit_total'] = [
       '#type' => 'number',
       '#title' => $this->t('Total submissions limit'),
       '#default_value' => $settings['limit_total'],
     ];
-    $form['submission']['entity_limit_total'] = [
+    $form['limits']['entity_limit_total'] = [
       '#type' => 'number',
       '#title' => $this->t('Total submissions limit per entity'),
       '#default_value' => $settings['entity_limit_total'],
     ];
-    $form['submission']['limit_total_message'] = [
+    $form['limits']['limit_total_message'] = [
       '#type' => 'yamlform_html_editor',
       '#title' => $this->t('Total submissions limit message'),
       '#default_value' => $settings['limit_total_message'],
     ];
-    $form['submission']['limit_user'] = [
+    $form['limits']['limit_user'] = [
       '#type' => 'number',
       '#title' => $this->t('Per user submission limit'),
       '#default_value' => $settings['limit_user'],
     ];
-    $form['submission']['entity_limit_user'] = [
+    $form['limits']['entity_limit_user'] = [
       '#type' => 'number',
       '#title' => $this->t('Per user submission limit per entity'),
       '#default_value' => $settings['entity_limit_user'],
     ];
-    $form['submission']['limit_user_message'] = [
+    $form['limits']['limit_user_message'] = [
       '#type' => 'yamlform_html_editor',
       '#title' => $this->t('Per user submission limit message'),
       '#default_value' => $settings['limit_user_message'],
     ];
 
-    $form['results'] = [
+    // Confirmation.
+    $form['confirmation'] = [
       '#type' => 'details',
-      '#title' => $this->t('Results settings'),
+      '#title' => $this->t('Confirmation settings'),
       '#open' => TRUE,
     ];
-    $form['results']['results_disabled'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Disable saving of submissions.'),
-      '#return_value' => TRUE,
-      '#description' => $this->t('If results are disabled, submissions must be sent via <a href=":href">email and/or a custom form handler</a>.', [':href' => Url::fromRoute('entity.yamlform.handlers_form', ['yamlform' => $yamlform->id()])->toString()]),
-      '#default_value' => $settings['results_disabled'],
+    $form['confirmation']['confirmation_type'] = [
+      '#title' => $this->t('Confirmation type'),
+      '#type' => 'radios',
+      '#options' => [
+        'page' => $this->t('Page (redirects to new page and displays the confirmation message)'),
+        'inline' => $this->t('Inline (reloads the current page and replaces the form with the confirmation message.)'),
+        'message' => $this->t('Message (reloads the current page/form and displays the confirmation message at the top of the page.)'),
+        'url' => $this->t('URL (redirects to a custom path or URL)'),
+        'url_message' => $this->t('URL with message (redirects to a custom path or URL and displays the confirmation message at the top of the page.)'),
+      ],
+      '#default_value' => $settings['confirmation_type'],
+    ];
+    $form['confirmation']['confirmation_url'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Confirmation URL'),
+      '#description' => $this->t('URL to redirect the user to upon successful submission.'),
+      '#default_value' => $settings['confirmation_url'],
+      '#states' => [
+        'visible' => [
+          [':input[name="confirmation_type"]' => ['value' => 'url']],
+          'xor',
+          [':input[name="confirmation_type"]' => ['value' => 'url_message']],
+        ],
+      ],
+    ];
+    $form['confirmation']['confirmation_message'] = [
+      '#type' => 'yamlform_html_editor',
+      '#title' => $this->t('Confirmation message'),
+      '#description' => $this->t('Message to be shown upon successful submission.'),
+      '#default_value' => $settings['confirmation_message'],
+      '#states' => [
+        'invisible' => [
+          ':input[name="confirmation_type"]' => ['value' => 'url'],
+        ],
+      ],
     ];
 
+    // Author.
     $form['author'] = [
       '#type' => 'details',
       '#title' => $this->t('Author information'),