diff --git a/config/core.entity_form_display.oc_case_fee.project_fee.default.yml b/config/core.entity_form_display.oc_case_fee.project_fee.default.yml
index 5008a94..178d4c1 100644
--- a/config/core.entity_form_display.oc_case_fee.project_fee.default.yml
+++ b/config/core.entity_form_display.oc_case_fee.project_fee.default.yml
@@ -24,6 +24,7 @@ content:
     settings: {  }
     third_party_settings: {  }
 hidden:
+  description: true
   feeds_item: true
   name: true
   oc_case: true
diff --git a/config/entity_extra_field.extra_field.oc_case.project.billing_details.yml b/config/entity_extra_field.extra_field.oc_case.project.billing_details.yml
index e2763d3..eee6584 100644
--- a/config/entity_extra_field.extra_field.oc_case.project.billing_details.yml
+++ b/config/entity_extra_field.extra_field.oc_case.project.billing_details.yml
@@ -24,19 +24,19 @@ field_type_config:
 field_type_condition:
   'entity_bundle:oc_case':
     id: 'entity_bundle:oc_case'
-    bundles:
-      project: project
+    negate: false
     context_mapping:
       oc_case: entity_extra_field.target_entity
-    negate: false
+    bundles:
+      project: project
   route:
     id: route
-    routes: ''
     negate: false
+    routes: ''
   request_path:
     id: request_path
-    pages: ''
     negate: false
+    pages: ''
   current_theme:
     id: current_theme
     theme: ''
diff --git a/config/entity_extra_field.extra_field.oc_case.project.fees.yml b/config/entity_extra_field.extra_field.oc_case.project.fees.yml
index be9d1f8..bce5f84 100644
--- a/config/entity_extra_field.extra_field.oc_case.project.fees.yml
+++ b/config/entity_extra_field.extra_field.oc_case.project.fees.yml
@@ -22,19 +22,19 @@ field_type_config:
 field_type_condition:
   'entity_bundle:oc_case':
     id: 'entity_bundle:oc_case'
-    bundles:
-      project: project
+    negate: false
     context_mapping:
       oc_case: entity_extra_field.target_entity
-    negate: false
+    bundles:
+      project: project
   route:
     id: route
-    routes: ''
     negate: false
+    routes: ''
   request_path:
     id: request_path
-    pages: ''
     negate: false
+    pages: ''
   current_theme:
     id: current_theme
     theme: ''
diff --git a/config/entity_extra_field.extra_field.oc_case.project.trainings.yml b/config/entity_extra_field.extra_field.oc_case.project.trainings.yml
index f994b3e..9ce708b 100644
--- a/config/entity_extra_field.extra_field.oc_case.project.trainings.yml
+++ b/config/entity_extra_field.extra_field.oc_case.project.trainings.yml
@@ -1,20 +1,21 @@
-uuid: 724b0e99-12c3-4028-a805-df614711c22f
+uuid: 4cf9ed31-fa62-41b4-a7a3-2750e7769e00
 langcode: en
 status: true
 dependencies:
   config:
     - field.storage.oc_case.field_date_of_training
+    - field.storage.oc_case.field_number_of_participants
     - field.storage.oc_case.field_project
     - field.storage.oc_case.field_training_status
     - field.storage.oc_case.field_training_type
     - opencase_cases.oc_case_type.training
     - system.menu.opencase
+    - user.role.authenticated
   module:
     - datetime
     - opencase_cases
     - opencase_entities
     - options
-    - paragraphs
     - user
 id: oc_case.project.trainings
 label: Trainings
@@ -31,23 +32,23 @@ field_type_config:
 field_type_condition:
   'entity_bundle:oc_case':
     id: 'entity_bundle:oc_case'
-    bundles:
-      project: project
+    negate: false
     context_mapping:
       oc_case: entity_extra_field.target_entity
-    negate: false
+    bundles:
+      project: project
   route:
     id: route
-    routes: ''
     negate: false
+    routes: ''
+  request_path:
+    id: request_path
+    negate: false
+    pages: ''
   current_theme:
     id: current_theme
     theme: ''
     negate: 0
-  request_path:
-    id: request_path
-    pages: ''
-    negate: false
 field_conditions_all_pass: false
 display:
   type: view
diff --git a/config/views.view.trainings.yml b/config/views.view.trainings.yml
index 8640031..45f871c 100644
--- a/config/views.view.trainings.yml
+++ b/config/views.view.trainings.yml
@@ -582,7 +582,18 @@ display:
       cache:
         type: tag
         options: {  }
-      empty: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: text_custom
+          empty: true
+          content: 'None yet.'
+          tokenize: false
       sorts: {  }
       arguments: {  }
       filters:
@@ -679,16 +690,7 @@ display:
           distinct: false
           replica: false
           query_tags: {  }
-      relationships:
-        field_trainer:
-          id: field_trainer
-          table: oc_case__field_trainer
-          field: field_trainer
-          relationship: none
-          group_type: group
-          admin_label: 'field_trainer: Paragraph'
-          plugin_id: standard
-          required: false
+      relationships: {  }
       group_by: false
       header:
         area_text_custom:
@@ -1411,80 +1413,6 @@ display:
         - 'config:field.storage.oc_case.field_project'
         - 'config:field.storage.oc_case.field_training_status'
         - 'config:field.storage.oc_case.field_training_type'
-  block_1:
-    id: block_1
-    display_title: 'By trainer'
-    display_plugin: block
-    position: 1
-    display_options:
-      sorts: {  }
-      arguments:
-        field_trainer_target_id:
-          id: field_trainer_target_id
-          table: paragraph__field_trainer
-          field: field_trainer_target_id
-          relationship: field_trainer
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 2
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        relationships: true
-        fields: true
-        sorts: false
-        arguments: false
-        filters: false
-        filter_groups: false
-        footer: false
-      display_description: ''
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.roles
-      tags:
-        - 'config:field.storage.oc_case.field_date_of_training'
-        - 'config:field.storage.oc_case.field_number_of_participants'
-        - 'config:field.storage.oc_case.field_project'
-        - 'config:field.storage.oc_case.field_training_status'
-        - 'config:field.storage.oc_case.field_training_type'
   block_2:
     id: block_2
     display_title: 'By client'
@@ -2047,15 +1975,6 @@ display:
         arguments: false
         footer: false
       relationships:
-        field_trainer:
-          id: field_trainer
-          table: oc_case__field_trainer
-          field: field_trainer
-          relationship: none
-          group_type: group
-          admin_label: 'field_trainer: Paragraph'
-          plugin_id: standard
-          required: false
         client:
           id: client
           table: oc_case_field_data