diff --git a/fillpdf.links.task.yml b/fillpdf.links.task.yml
index ee502ad30ef72ba0828c81abca36f66418a83440..c605df1572fc4ce50db63076701bd445a170b86b 100644
--- a/fillpdf.links.task.yml
+++ b/fillpdf.links.task.yml
@@ -9,3 +9,21 @@ fillpdf.settings:
   route_name: fillpdf.settings
   base_route: fillpdf.forms_admin
   weight: 30
+
+entity.fillpdf_form.canonical:
+  title: 'Edit'
+  route_name: entity.fillpdf_form.canonical
+  base_route: entity.fillpdf_form.canonical
+  weight: -10
+
+entity.fillpdf_form.export_form:
+  title: 'Export'
+  route_name: entity.fillpdf_form.export_form
+  base_route: entity.fillpdf_form.canonical
+  weight: 10
+
+entity.fillpdf_form.import_form:
+  title: 'Import'
+  route_name: entity.fillpdf_form.import_form
+  base_route: entity.fillpdf_form.canonical
+  weight: 15
diff --git a/fillpdf.routing.yml b/fillpdf.routing.yml
index fe16e9734e2c53a962a932a2a98ef571b352f9c0..9040e6c5159b5b4a88032c38d8d3ed8d8f4b367d 100644
--- a/fillpdf.routing.yml
+++ b/fillpdf.routing.yml
@@ -60,7 +60,7 @@ entity.fillpdf_form.import_form:
     _entity_form: fillpdf_form.import
     _title: 'Import FillPDF form configuration and field mappings'
   requirements:
-    _entity_access: fillpdf_form.view
+    _entity_access: fillpdf_form.update
 
 entity.fillpdf_form.duplicate_form:
   path: '/admin/structure/fillpdf/{fillpdf_form}/duplicate'
diff --git a/src/Form/FillPdfFormForm.php b/src/Form/FillPdfFormForm.php
index 0048b10c13c859fbe92869b9696ad1270aaebe42..e83f0b9cc19189df7718a3e49235009ab8c88d23 100644
--- a/src/Form/FillPdfFormForm.php
+++ b/src/Form/FillPdfFormForm.php
@@ -12,7 +12,6 @@ use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Render\RendererInterface;
-use Drupal\Core\Url;
 use Drupal\fillpdf\Component\Utility\FillPdf;
 use Drupal\fillpdf\FillPdfAdminFormHelperInterface;
 use Drupal\fillpdf\FillPdfLinkManipulatorInterface;
@@ -435,20 +434,6 @@ class FillPdfFormForm extends ContentEntityForm {
 
     $form['fillpdf_fields']['#weight'] = 100;
 
-    $form['export_fields'] = [
-      '#prefix' => '<div>',
-      '#markup' => Link::fromTextAndUrl($this->t('Export these field mappings'), Url::fromRoute('entity.fillpdf_form.export_form', ['fillpdf_form' => $fillpdf_form->id()]))->toString(),
-      '#suffix' => '</div>',
-      '#weight' => 100,
-    ];
-
-    $form['import_fields'] = [
-      '#prefix' => '<div>',
-      '#markup' => Link::fromTextAndUrl($this->t('Import a previous export into this PDF'), Url::fromRoute('entity.fillpdf_form.import_form', ['fillpdf_form' => $fillpdf_form->id()]))->toString(),
-      '#suffix' => '</div>',
-      '#weight' => 100,
-    ];
-
     return $form;
   }