diff --git a/config/views.view.debriefs.yml b/config/views.view.debriefs.yml
index 8a651f5..c3bd2d2 100644
--- a/config/views.view.debriefs.yml
+++ b/config/views.view.debriefs.yml
@@ -6,6 +6,7 @@ dependencies:
     - opencase_entities.oc_activity_type.trainer_debrief
     - user.role.authenticated
   module:
+    - datetime
     - opencase_cases
     - opencase_entities
     - user
@@ -27,71 +28,6 @@ display:
     display_options:
       title: Debrief
       fields:
-        oc_provider:
-          id: oc_provider
-          table: oc_activity_field_data
-          field: oc_provider
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: oc_activity
-          entity_field: oc_provider
-          plugin_id: field
-          label: Trainer
-          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
         status:
           id: status
           table: oc_activity_field_data
@@ -159,17 +95,17 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        created:
-          id: created
+        activity_date_time:
+          id: activity_date_time
           table: oc_activity_field_data
-          field: created
+          field: activity_date_time
           relationship: none
           group_type: group
           admin_label: ''
           entity_type: oc_activity
-          entity_field: created
+          entity_field: activity_date_time
           plugin_id: field
-          label: Created
+          label: Date
           exclude: false
           alter:
             alter_text: false
@@ -211,11 +147,10 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: value
-          type: timestamp
+          type: datetime_default
           settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
+            timezone_override: ''
+            format_type: medium
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -226,6 +161,71 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
+        oc_provider:
+          id: oc_provider
+          table: oc_activity_field_data
+          field: oc_provider
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_activity
+          entity_field: oc_provider
+          plugin_id: field
+          label: 'Submitted by'
+          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
         view_oc_activity:
           id: view_oc_activity
           table: oc_activity
diff --git a/config/views.view.trainings.yml b/config/views.view.trainings.yml
index f769a11..f7d96f1 100644
--- a/config/views.view.trainings.yml
+++ b/config/views.view.trainings.yml
@@ -4,6 +4,7 @@ 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
@@ -15,7 +16,6 @@ dependencies:
     - opencase_cases
     - opencase_entities
     - options
-    - paragraphs
     - user
 _core:
   default_config_hash: WEXYdHXh9zqan0bEwCzQypvhQhKOI9vpV1OM5DO-Rlk
@@ -482,6 +482,70 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
+        field_number_of_participants:
+          id: field_number_of_participants
+          table: oc_case__field_number_of_participants
+          field: field_number_of_participants
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: field
+          label: 'Number of participants'
+          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: number_integer
+          settings:
+            thousand_separator: ''
+            prefix_suffix: true
+          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
       pager:
         type: mini
         options:
@@ -665,6 +729,7 @@ display:
         - 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'
@@ -1123,6 +1188,70 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
+        field_number_of_participants:
+          id: field_number_of_participants
+          table: oc_case__field_number_of_participants
+          field: field_number_of_participants
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: field
+          label: 'Number of participants'
+          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: number_integer
+          settings:
+            thousand_separator: ''
+            prefix_suffix: true
+          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
       pager:
         type: none
         options:
@@ -1283,6 +1412,7 @@ display:
         - 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'
@@ -1356,6 +1486,7 @@ display:
         - 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'
@@ -1955,6 +2086,7 @@ display:
         - 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'
@@ -3134,6 +3266,7 @@ display:
         - 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'