diff --git a/config/core.entity_view_display.oc_activity.trainer_debrief.default.yml b/config/core.entity_view_display.oc_activity.trainer_debrief.default.yml
index 39bab7c..c0500a1 100644
--- a/config/core.entity_view_display.oc_activity.trainer_debrief.default.yml
+++ b/config/core.entity_view_display.oc_activity.trainer_debrief.default.yml
@@ -15,7 +15,6 @@ dependencies:
     - opencase_entities.oc_activity_type.trainer_debrief
   module:
     - image
-    - user
 id: oc_activity.trainer_debrief.default
 targetEntityType: oc_activity
 bundle: trainer_debrief
@@ -26,21 +25,21 @@ content:
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 9
+    weight: 10
     region: content
   field_issues_and_difficulties:
     type: basic_string
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 4
+    weight: 5
     region: content
   field_issues_with_group_dynamics:
     type: basic_string
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 5
+    weight: 6
     region: content
   field_number_of_participants:
     type: number_integer
@@ -49,7 +48,7 @@ content:
       thousand_separator: ''
       prefix_suffix: true
     third_party_settings: {  }
-    weight: 1
+    weight: 2
     region: content
   field_photo:
     type: image
@@ -58,35 +57,35 @@ content:
       image_link: ''
       image_style: ''
     third_party_settings: {  }
-    weight: 8
+    weight: 9
     region: content
   field_what_came_up_for_the_group:
     type: basic_string
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 3
+    weight: 4
     region: content
   field_what_could_be_improved_for:
     type: basic_string
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 7
+    weight: 8
     region: content
   field_what_did_facilitators_do_w:
     type: basic_string
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 2
+    weight: 3
     region: content
   field_what_real_scenarios_or_inc:
     type: basic_string
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 6
+    weight: 7
     region: content
   name:
     type: string
@@ -96,16 +95,20 @@ content:
     third_party_settings: {  }
     weight: 0
     region: content
-  user_id:
-    type: author
+  oc_provider:
+    type: entity_reference_label
     label: above
-    settings: {  }
+    settings:
+      link: true
     third_party_settings: {  }
-    weight: 10
+    weight: 1
     region: content
 hidden:
   activity_date_time: true
   client: true
-  oc_provider: true
+  description: true
+  oc_target: true
   search_api_excerpt: true
+  status: true
   time_taken: true
+  user_id: true
diff --git a/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml b/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml
index e0c9110..03835da 100644
--- a/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml
+++ b/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml
@@ -19,7 +19,7 @@ dependencies:
     - user
 id: oc_organisation.client.trainings
 label: Trainings
-display_label: false
+display_label: true
 name: trainings
 description: ''
 base_entity_type_id: oc_organisation
diff --git a/config/views.view.debrief_report.yml b/config/views.view.debrief_report.yml
index 1629998..1a9197d 100644
--- a/config/views.view.debrief_report.yml
+++ b/config/views.view.debrief_report.yml
@@ -170,7 +170,7 @@ display:
           entity_type: oc_activity
           entity_field: oc_provider
           plugin_id: field
-          label: Trainer
+          label: 'Submitted by'
           exclude: false
           alter:
             alter_text: false
@@ -225,6 +225,59 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
+        view_oc_activity:
+          id: view_oc_activity
+          table: oc_activity
+          field: view_oc_activity
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_activity
+          plugin_id: entity_link
+          label: ''
+          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: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          text: view
+          output_url_as_text: false
+          absolute: false
       pager:
         type: mini
         options: