diff --git a/composer.lock b/composer.lock
index df5c454..3e3593c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -68,7 +68,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/goodnightout_opencase.git",
-                "reference": "2368552c9a018be345d710c1c0b00f092874b274"
+                "reference": "3af91cf1a55939fa0ce7125d821faaf3fa812ba6"
             },
             "require": {
                 "drupal/admin_toolbar": "*",
@@ -86,7 +86,7 @@
                     "email": "helo@autonomic.zone"
                 }
             ],
-            "time": "2022-05-10T07:49:11+00:00"
+            "time": "2022-05-18T17:42:38+00:00"
         },
         {
             "name": "autonomic/opencase",
diff --git a/config/core.entity_form_display.oc_activity.emi.default.yml b/config/core.entity_form_display.oc_activity.emi.default.yml
index e0bf8a5..d833807 100644
--- a/config/core.entity_form_display.oc_activity.emi.default.yml
+++ b/config/core.entity_form_display.oc_activity.emi.default.yml
@@ -5,43 +5,39 @@ dependencies:
   config:
     - opencase_entities.oc_activity_type.emi
   module:
-    - hide_revision_field
+    - datetime
 id: oc_activity.emi.default
 targetEntityType: oc_activity
 bundle: emi
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  description:
+    type: string_textarea
+    weight: 2
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
   name:
     type: string_textfield
-    weight: -3
+    weight: 1
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 80
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: false
-      default: ''
-      permission_based: false
-      allow_user_settings: false
-    third_party_settings: {  }
-  time_taken:
-    type: number
-    weight: -3
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
 hidden:
-  activity_date_time: true
   client: true
-  description: true
   oc_provider: true
   oc_target: true
+  revision_log: true
   status: true
+  time_taken: true
+  user_id: true
diff --git a/config/core.entity_form_display.oc_activity.phone_call.default.yml b/config/core.entity_form_display.oc_activity.phone_call.default.yml
index 543c580..0ded4ce 100644
--- a/config/core.entity_form_display.oc_activity.phone_call.default.yml
+++ b/config/core.entity_form_display.oc_activity.phone_call.default.yml
@@ -4,11 +4,19 @@ status: true
 dependencies:
   config:
     - opencase_entities.oc_activity_type.phone_call
+  module:
+    - datetime
 id: oc_activity.phone_call.default
 targetEntityType: oc_activity
 bundle: phone_call
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   description:
     type: string_textarea
     weight: 2
@@ -19,24 +27,17 @@ content:
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 0
+    weight: 1
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  time_taken:
-    type: number
-    weight: 1
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
 hidden:
-  activity_date_time: true
   client: true
   oc_provider: true
   oc_target: true
   revision_log: true
   status: true
+  time_taken: true
   user_id: true
diff --git a/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml b/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml
index d9e6d6d..e25b400 100644
--- a/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml
+++ b/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml
@@ -24,13 +24,13 @@ mode: default
 content:
   activity_date_time:
     type: datetime_default
-    weight: 11
+    weight: 0
     region: content
     settings: {  }
     third_party_settings: {  }
   field_caption_for_photo:
     type: string_textarea
-    weight: 9
+    weight: 10
     region: content
     settings:
       rows: 5
@@ -38,7 +38,7 @@ content:
     third_party_settings: {  }
   field_issues_and_difficulties:
     type: string_textarea
-    weight: 4
+    weight: 5
     region: content
     settings:
       rows: 5
@@ -46,7 +46,7 @@ content:
     third_party_settings: {  }
   field_issues_with_group_dynamics:
     type: string_textarea
-    weight: 5
+    weight: 6
     region: content
     settings:
       rows: 5
@@ -54,14 +54,14 @@ content:
     third_party_settings: {  }
   field_number_of_participants:
     type: number
-    weight: 1
+    weight: 2
     region: content
     settings:
       placeholder: ''
     third_party_settings: {  }
   field_photo:
     type: image_image
-    weight: 8
+    weight: 9
     region: content
     settings:
       progress_indicator: throbber
@@ -69,7 +69,7 @@ content:
     third_party_settings: {  }
   field_what_came_up_for_the_group:
     type: string_textarea
-    weight: 3
+    weight: 4
     region: content
     settings:
       rows: 5
@@ -77,7 +77,7 @@ content:
     third_party_settings: {  }
   field_what_could_be_improved_for:
     type: string_textarea
-    weight: 7
+    weight: 8
     region: content
     settings:
       rows: 5
@@ -85,7 +85,7 @@ content:
     third_party_settings: {  }
   field_what_did_facilitators_do_w:
     type: string_textarea
-    weight: 2
+    weight: 3
     region: content
     settings:
       rows: 5
@@ -93,7 +93,7 @@ content:
     third_party_settings: {  }
   field_what_real_scenarios_or_inc:
     type: string_textarea
-    weight: 6
+    weight: 7
     region: content
     settings:
       rows: 5
@@ -101,13 +101,13 @@ content:
     third_party_settings: {  }
   oc_provider:
     type: options_select
-    weight: 0
+    weight: 1
     region: content
     settings: {  }
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 10
+    weight: 11
     region: content
     settings:
       display_label: true
diff --git a/config/core.entity_view_display.oc_activity.emi.default.yml b/config/core.entity_view_display.oc_activity.emi.default.yml
index 70f80eb..859f599 100644
--- a/config/core.entity_view_display.oc_activity.emi.default.yml
+++ b/config/core.entity_view_display.oc_activity.emi.default.yml
@@ -6,7 +6,6 @@ dependencies:
     - opencase_entities.oc_activity_type.emi
   module:
     - datetime
-    - user
 id: oc_activity.emi.default
 targetEntityType: oc_activity
 bundle: emi
@@ -17,7 +16,7 @@ content:
     label: above
     settings:
       timezone_override: ''
-      format_type: medium
+      format_type: short
     third_party_settings: {  }
     weight: 0
     region: content
@@ -29,6 +28,13 @@ content:
     third_party_settings: {  }
     weight: 1
     region: content
+  description:
+    type: basic_string
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 3
+    region: content
   name:
     type: string
     label: hidden
@@ -37,13 +43,10 @@ content:
     third_party_settings: {  }
     weight: 2
     region: content
-  user_id:
-    type: author
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
 hidden:
+  oc_provider: true
+  oc_target: true
   search_api_excerpt: true
+  status: true
   time_taken: true
+  user_id: true
diff --git a/config/core.entity_view_display.oc_activity.phone_call.default.yml b/config/core.entity_view_display.oc_activity.phone_call.default.yml
index c2455b0..b7a3fc3 100644
--- a/config/core.entity_view_display.oc_activity.phone_call.default.yml
+++ b/config/core.entity_view_display.oc_activity.phone_call.default.yml
@@ -5,19 +5,28 @@ dependencies:
   config:
     - opencase_entities.oc_activity_type.phone_call
   module:
-    - user
+    - datetime
 id: oc_activity.phone_call.default
 targetEntityType: oc_activity
 bundle: phone_call
 mode: default
 content:
+  activity_date_time:
+    type: datetime_default
+    label: above
+    settings:
+      timezone_override: ''
+      format_type: short
+    third_party_settings: {  }
+    weight: 0
+    region: content
   client:
     type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    weight: 0
+    weight: 1
     region: content
   description:
     type: basic_string
@@ -34,27 +43,10 @@ content:
     third_party_settings: {  }
     weight: 2
     region: content
-  time_taken:
-    type: number_decimal
-    label: above
-    settings:
-      thousand_separator: ''
-      decimal_separator: .
-      scale: 2
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  user_id:
-    type: author
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 4
-    region: content
 hidden:
-  activity_date_time: true
   oc_provider: true
   oc_target: true
   search_api_excerpt: true
   status: true
+  time_taken: true
+  user_id: true
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 08105b7..e9e146a 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
@@ -26,9 +26,9 @@ content:
     label: above
     settings:
       timezone_override: ''
-      format_type: medium
+      format_type: short
     third_party_settings: {  }
-    weight: 11
+    weight: 0
     region: content
   field_caption_for_photo:
     type: basic_string
@@ -97,14 +97,6 @@ content:
     third_party_settings: {  }
     weight: 7
     region: content
-  name:
-    type: string
-    label: hidden
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 0
-    region: content
   oc_provider:
     type: entity_reference_label
     label: above
@@ -116,6 +108,7 @@ content:
 hidden:
   client: true
   description: true
+  name: true
   oc_target: true
   search_api_excerpt: true
   status: true
diff --git a/config/core.entity_view_display.oc_actor.trainer.default.yml b/config/core.entity_view_display.oc_actor.trainer.default.yml
index 7a9439d..454fcd7 100644
--- a/config/core.entity_view_display.oc_actor.trainer.default.yml
+++ b/config/core.entity_view_display.oc_actor.trainer.default.yml
@@ -138,6 +138,15 @@ content:
     third_party_settings: {  }
     weight: 9
     region: content
+  total_cases:
+    type: number_integer
+    label: above
+    settings:
+      thousand_separator: ''
+      prefix_suffix: true
+    third_party_settings: {  }
+    weight: 14
+    region: content
 hidden:
   feeds_item: true
   full_name: true
@@ -146,5 +155,4 @@ hidden:
   recent_cases: true
   search_api_excerpt: true
   status: true
-  total_cases: true
   user_id: true
diff --git a/config/core.extension.yml b/config/core.extension.yml
index c16d127..5ca88ec 100644
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -45,6 +45,7 @@ module:
   jquery_ui_touch_punch: 0
   jsonapi: 0
   link: 0
+  mailsystem: 0
   menu_link_content: 0
   menu_ui: 0
   node: 0
diff --git a/config/mailsystem.settings.yml b/config/mailsystem.settings.yml
new file mode 100644
index 0000000..29ef3b3
--- /dev/null
+++ b/config/mailsystem.settings.yml
@@ -0,0 +1,11 @@
+_core:
+  default_config_hash: IhwTepsVwtbtbcT5GzQKhCXDCRvbk3MNkWqPiuiZ10s
+theme: current
+defaults:
+  sender: php_mail
+  formatter: php_mail
+modules:
+  swiftmailer:
+    none:
+      sender: swiftmailer
+      formatter: swiftmailer
diff --git a/config/system.logging.yml b/config/system.logging.yml
index e95b28a..0137fe9 100644
--- a/config/system.logging.yml
+++ b/config/system.logging.yml
@@ -1,3 +1,3 @@
-error_level: hide
 _core:
   default_config_hash: u3-njszl92FaxjrCMiq0yDcjAfcdx72w1zT1O9dx6aA
+error_level: all
diff --git a/config/system.performance.yml b/config/system.performance.yml
index 65d6e1a..b380f12 100644
--- a/config/system.performance.yml
+++ b/config/system.performance.yml
@@ -1,9 +1,12 @@
+_core:
+  default_config_hash: b2cssrj-lOmATIbdehfCqfCFgVR0qCdxxWhwqa2KBVQ
 cache:
   page:
     max_age: 0
+    use_internal: false
 css:
   preprocess: false
-  gzip: true
+  gzip: false
 fast_404:
   enabled: true
   paths: '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i'
@@ -11,7 +14,7 @@ fast_404:
   html: '<!DOCTYPE html><html><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>'
 js:
   preprocess: false
-  gzip: true
+  gzip: false
 stale_file_threshold: 2592000
-_core:
-  default_config_hash: b2cssrj-lOmATIbdehfCqfCFgVR0qCdxxWhwqa2KBVQ
+response:
+  gzip: false
diff --git a/config/views.settings.yml b/config/views.settings.yml
index fbda2e6..d78ef33 100644
--- a/config/views.settings.yml
+++ b/config/views.settings.yml
@@ -1,3 +1,5 @@
+_core:
+  default_config_hash: RaRd9EIcwA4u3qCSRLL8EnCicbda1kV__ASmVbyehvQ
 display_extenders: {  }
 skip_cache: false
 sql_signature: false
@@ -5,13 +7,13 @@ ui:
   show:
     additional_queries: false
     advanced_column: false
-    master_display: false
-    performance_statistics: false
+    performance_statistics: true
     preview_information: true
     sql_query:
-      enabled: false
+      enabled: true
       where: above
     display_embed: false
+    master_display: false
   always_live_preview: true
   exposed_filter_any_label: old_any
 field_rewrite_elements:
@@ -44,5 +46,3 @@ field_rewrite_elements:
   ins: INS
   q: Q
   s: S
-_core:
-  default_config_hash: RaRd9EIcwA4u3qCSRLL8EnCicbda1kV__ASmVbyehvQ
diff --git a/config/views.view.all_trainers.yml b/config/views.view.all_trainers.yml
index e2bcaf3..327a961 100644
--- a/config/views.view.all_trainers.yml
+++ b/config/views.view.all_trainers.yml
@@ -160,6 +160,72 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
+        total_cases:
+          id: total_cases
+          table: oc_actor_field_data
+          field: total_cases
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_actor
+          entity_field: total_cases
+          plugin_id: field
+          label: 'Number of Cases'
+          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:
diff --git a/config/views.view.debriefs.yml b/config/views.view.debriefs.yml
index 5bdaa83..24c5056 100644
--- a/config/views.view.debriefs.yml
+++ b/config/views.view.debriefs.yml
@@ -150,7 +150,7 @@ display:
           type: datetime_default
           settings:
             timezone_override: ''
-            format_type: medium
+            format_type: short
           group_column: value
           group_columns: {  }
           group_rows: true