diff --git a/white_label_entity.links.action.yml b/white_label_entity.links.action.yml
index 8a2b0e5..779d6b2 100644
--- a/white_label_entity.links.action.yml
+++ b/white_label_entity.links.action.yml
@@ -2,7 +2,7 @@ entity.while_entity.add_form:
   route_name: 'entity.while_entity.add_page'
   title: 'Add While entity'
   appears_on:
-    - entity.while_entity.collection
+    - view.while_content.page_1
   class: \Drupal\white_label_entity\Plugin\Menu\LocalAction\WhileEntityAddLocalAction
 entity.while_entity_type.add_form:
   route_name: 'entity.while_entity_type.add_form'
diff --git a/white_label_entity.module b/white_label_entity.module
index 5ee4a73..f9ae910 100644
--- a/white_label_entity.module
+++ b/white_label_entity.module
@@ -7,6 +7,7 @@
 
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\Routing\RouteMatchInterface;
+use \Drupal\Core\Form\FormStateInterface;
 
 /**
  * Implements hook_help().
@@ -59,17 +60,8 @@ function white_label_entity_theme_suggestions_while_entity(array $variables) {
  */
 function white_label_entity_menu_links_discovered_alter(&$links) {
   // Add links dynamically, so configured entity names are applied.
-  $entity_type_while = \Drupal::entityTypeManager()->getDefinition('while_entity');
   $entity_type_while_type = \Drupal::entityTypeManager()->getDefinition('while_entity_type');
 
-  $links['entity.while_entity.collection'] = [
-    'title' => $entity_type_while->getLabel(),
-    'route_name' => 'entity.while_entity.collection',
-    'description' => new TranslatableMarkup('Manage @entity_name_plural.', ['@entity_name_plural' => $entity_type_while->getPluralLabel()]),
-    'parent' => 'system.admin_content',
-    'weight' => 0,
-  ];
-
   $links['entity.while_entity_type.collection'] = [
     'title' => $entity_type_while_type->getLabel(),
     'route_name' => 'entity.while_entity_type.collection',
@@ -80,6 +72,28 @@ function white_label_entity_menu_links_discovered_alter(&$links) {
 }
 
 /**
+ * Implements hook_menu_local_tasks_alter().
+ */
+function white_label_entity_menu_local_tasks_alter(&$data, $route_name) {
+  $entity_type_while = \Drupal::entityTypeManager()->getDefinition('while_entity');
+
+  if (array_key_exists('views_view:view.while_content.page_1', $data['tabs'][0])) {
+    $data['tabs'][0]['views_view:view.while_content.page_1']['#link']['title'] = $entity_type_while->getLabel();
+  }
+}
+
+/**
+ * Implements hook_form_alter().
+ */
+function white_label_entity_form_views_exposed_form_alter(&$form, FormStateInterface $form_state, $form_id) {
+  $entity_type_while_type = \Drupal::entityTypeManager()->getDefinition('while_entity_type');
+
+  if (array_key_exists('filter-type', $form['#info'])) {
+    $form['#info']['filter-type']['label'] = $entity_type_while_type->getLabel();
+  }
+}
+
+/**
  * Implements hook_entity_type_alter().
  */
 function white_label_entity_entity_type_alter(&$entity_types) {