diff --git a/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php b/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php
index be11617..d6824a5 100644
--- a/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php
+++ b/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php
@@ -166,6 +166,7 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
       '#required' => TRUE,
       '#ajax' => TRUE,
       '#limit_validation_errors' => array(),
+      '#weight' => 1,
     );
     $form['handler']['handler_submit'] = array(
       '#type' => 'submit',
diff --git a/core/modules/taxonomy/src/Plugin/EntityReferenceSelection/TermSelection.php b/core/modules/taxonomy/src/Plugin/EntityReferenceSelection/TermSelection.php
index ddf99ca..ac24c92 100644
--- a/core/modules/taxonomy/src/Plugin/EntityReferenceSelection/TermSelection.php
+++ b/core/modules/taxonomy/src/Plugin/EntityReferenceSelection/TermSelection.php
@@ -39,12 +39,14 @@ public function entityQueryAlter(SelectInterface $query) {
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $form = parent::buildConfigurationForm($form, $form_state);
 
-    $form['target_bundles']['#title'] = $this->t('Vocabularies');
+    $form['target_bundles']['#title'] = $this->t('Available Vocabularies');
+
     // @todo: Currently allow auto-create only on taxonomy terms.
     $form['auto_create'] = array(
       '#type' => 'checkbox',
       '#title' => $this->t("Create referenced entities if they don't already exist"),
       '#default_value' => isset($this->configuration['handler_settings']['auto_create']) ? $this->configuration['handler_settings']['auto_create'] : FALSE,
+      '#prefix' => '<hr>',
     );
 
     // Sorting is not possible for taxonomy terms because we use