diff --git a/config/optional/views.view.while_content.yml b/config/optional/views.view.while_content.yml
new file mode 100644
index 0000000..b64b3c2
--- /dev/null
+++ b/config/optional/views.view.while_content.yml
@@ -0,0 +1,557 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+    - white_label_entity
+id: while_content
+label: 'While content'
+module: views
+description: ''
+tag: ''
+base_table: while_entity_field_data
+base_field: id
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access while entity overview'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Submit
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Ascending
+          sort_desc_label: Descending
+      pager:
+        type: mini
+        options:
+          items_per_page: 30
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Elements per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: ‹‹
+            next: ››
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            created: created
+            name: name
+            user_id: user_id
+            operations: operations
+          info:
+            created:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            name:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            user_id:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            operations:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: created
+          empty_table: false
+      row:
+        type: fields
+      fields:
+        created:
+          id: created
+          table: while_entity_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Erstellt
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: medium
+            custom_date_format: ''
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: while_entity
+          entity_field: created
+          plugin_id: field
+        name:
+          table: while_entity_field_data
+          field: name
+          id: name
+          entity_type: null
+          entity_field: name
+          plugin_id: field
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Titel
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        user_id:
+          id: user_id
+          table: while_entity_field_data
+          field: user_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Geschrieben von'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: while_entity
+          entity_field: user_id
+          plugin_id: field
+        operations:
+          id: operations
+          table: while_entity
+          field: operations
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Operations
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          destination: true
+          entity_type: while_entity
+          plugin_id: entity_operations
+      filters:
+        name:
+          id: name
+          table: while_entity_field_data
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: name_op
+            label: Titel
+            description: ''
+            use_operator: false
+            operator: name_op
+            identifier: name
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+              editor: '0'
+              site_manager: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: while_entity
+          entity_field: name
+          plugin_id: string
+        type:
+          id: type
+          table: while_entity_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: type_op
+            label: 'While entity type'
+            description: ''
+            use_operator: false
+            operator: type_op
+            identifier: type
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+              editor: '0'
+              site_manager: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: while_entity
+          entity_field: type
+          plugin_id: bundle
+        uid:
+          id: uid
+          table: users_field_data
+          field: uid
+          relationship: user_id
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: uid_op
+            label: Name
+            description: ''
+            use_operator: false
+            operator: uid_op
+            identifier: uid
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+              editor: '0'
+              site_manager: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: user
+          entity_field: uid
+          plugin_id: user_name
+      sorts:
+        created:
+          id: created
+          table: while_entity_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: DESC
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+          entity_type: while_entity
+          entity_field: created
+          plugin_id: date
+      title: 'While content'
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships:
+        user_id:
+          id: user_id
+          table: while_entity_field_data
+          field: user_id
+          relationship: none
+          group_type: group
+          admin_label: Benutzer
+          required: false
+          entity_type: while_entity
+          entity_field: user_id
+          plugin_id: standard
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      tags: {  }
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: admin/content/while
+      menu:
+        type: tab
+        title: While
+        description: ''
+        expanded: false
+        parent: ''
+        weight: 5
+        context: '0'
+        menu_name: main
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      tags: {  }
diff --git a/src/Routing/WhileRouteSubscriber.php b/src/Routing/WhileRouteSubscriber.php
new file mode 100644
index 0000000..1c91928
--- /dev/null
+++ b/src/Routing/WhileRouteSubscriber.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Drupal\white_label_entity\Routing;
+
+use Drupal\Core\Routing\RouteSubscriberBase;
+use Symfony\Component\Routing\RouteCollection;
+use Drupal\Core\Config\ConfigFactoryInterface;
+
+/**
+ * Listens to the dynamic route events.
+ */
+class WhileRouteSubscriber extends RouteSubscriberBase {
+
+  /**
+   * The config factory.
+   *
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
+   */
+  protected $configFactory;
+
+  /**
+   * Constructs a new NodeAdminRouteSubscriber.
+   *
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The config factory.
+   */
+  public function __construct(ConfigFactoryInterface $config_factory) {
+    $this->configFactory = $config_factory;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function alterRoutes(RouteCollection $collection) {
+    $config = $this->configFactory->get('white_label_entity.settings');
+    $while_base_path = $config->get('base_path');
+
+    // Change path to currently active config.
+    if ($route = $collection->get('view.while_content.page_1')) {
+      $route->setPath('/admin/content/' . $while_base_path);
+    }
+  }
+
+}
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) {
diff --git a/white_label_entity.services.yml b/white_label_entity.services.yml
new file mode 100644
index 0000000..b9e1190
--- /dev/null
+++ b/white_label_entity.services.yml
@@ -0,0 +1,6 @@
+services:
+  white_label_entity.route_subscriber:
+    class: Drupal\white_label_entity\Routing\WhileRouteSubscriber
+    arguments: ['@config.factory']
+    tags:
+      - { name: event_subscriber }
\ No newline at end of file