diff --git a/css/fillpdf.form.css b/css/fillpdf.form.css
index 6ffcbeb596a833936633578451ad1a30a9f39c26..56cd197efa74011640bf06df0b9c2c84491c8131 100644
--- a/css/fillpdf.form.css
+++ b/css/fillpdf.form.css
@@ -3,7 +3,8 @@
   vertical-align: top;
 }
 
-#edit-storage .form-item {
+#edit-storage .form-item,
+#edit-title-wrapper .form-item {
   margin-bottom: 0;
 }
 
diff --git a/src/Entity/FillPdfForm.php b/src/Entity/FillPdfForm.php
index 5fb5c0d234db4c2fa04146e9cb261189b47d253c..1a8de655e73b37c2c47637e4a2680324c29c2efe 100644
--- a/src/Entity/FillPdfForm.php
+++ b/src/Entity/FillPdfForm.php
@@ -81,7 +81,7 @@ class FillPdfForm extends ContentEntityBase implements FillPdfFormInterface {
 
     $fields['title'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Filename pattern'))
-      ->setDescription(t('Enter a title for this mapping configuration. This will be used for deciding the filename of your PDF. <strong>This field supports tokens.</strong>'))
+      ->setDescription(new TranslatableMarkup('This pattern will be used for deciding the filename of your PDF. This field supports tokens.'))
       ->setDisplayOptions('form', [
         'type' => 'string',
         'weight' => 10,
diff --git a/src/Form/FillPdfFormForm.php b/src/Form/FillPdfFormForm.php
index 02d64dbfe1c87fc953bf2c4bf25cb8abb825fd8e..95e60718449241125893c5c649521bed23bf1594 100644
--- a/src/Form/FillPdfFormForm.php
+++ b/src/Form/FillPdfFormForm.php
@@ -124,12 +124,7 @@ class FillPdfFormForm extends ContentEntityForm {
     /** @var \Drupal\fillpdf\FillPdfFormInterface $entity */
     $entity = $this->entity;
 
-    $form['tokens'] = [
-      '#type' => 'fieldset',
-      '#title' => $this->t('Tokens'),
-      '#weight' => 11,
-      'token_tree' => $this->adminFormHelper->getAdminTokenForm(),
-    ];
+    $form['title']['token_tree'] = $this->adminFormHelper->getAdminTokenForm();
 
     $entity_types = [];
     $entity_type_definitions = $this->entityTypeManager->getDefinitions();