diff --git a/config/views.view.debriefs.yml b/config/views.view.debriefs.yml
index ac9c55e..6d8fe45 100644
--- a/config/views.view.debriefs.yml
+++ b/config/views.view.debriefs.yml
@@ -21,104 +21,12 @@ base_table: oc_activity_field_data
 base_field: id
 display:
   default:
-    display_plugin: default
     id: default
     display_title: Master
+    display_plugin: default
     position: 0
     display_options:
-      access:
-        type: role
-        options:
-          role:
-            authenticated: authenticated
-      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: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: some
-        options:
-          items_per_page: 1
-          offset: 0
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: '{{ status }}'
-          default_row_class: true
-          override: true
-          sticky: false
-          caption: ''
-          summary: 'Trainer Debrief'
-          description: ''
-          columns:
-            field_trainer: field_trainer
-            activity_date_time: activity_date_time
-            status: status
-            view_oc_activity: view_oc_activity
-            edit_oc_activity: edit_oc_activity
-          info:
-            field_trainer:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            activity_date_time:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            view_oc_activity:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            edit_oc_activity:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: '-1'
-          empty_table: false
-      row:
-        type: fields
-        options:
-          inline: {  }
-          separator: ''
-          hide_empty: false
-          default_field_elements: true
+      title: Debrief
       fields:
         field_trainer:
           id: field_trainer
@@ -127,6 +35,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: field
           label: Trainer
           exclude: false
           alter:
@@ -182,7 +91,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          plugin_id: field
         status:
           id: status
           table: oc_activity_field_data
@@ -190,6 +98,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: oc_activity
+          entity_field: status
+          plugin_id: field
           label: 'Publishing status'
           exclude: true
           alter:
@@ -235,8 +146,8 @@ display:
           type: boolean
           settings:
             format: default
-            format_custom_true: ''
             format_custom_false: ''
+            format_custom_true: ''
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -247,9 +158,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: oc_activity
-          entity_field: status
-          plugin_id: field
         created:
           id: created
           table: oc_activity_field_data
@@ -257,6 +165,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: oc_activity
+          entity_field: created
+          plugin_id: field
           label: Created
           exclude: false
           alter:
@@ -314,9 +225,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: oc_activity
-          entity_field: created
-          plugin_id: field
         view_oc_activity:
           id: view_oc_activity
           table: oc_activity
@@ -324,6 +232,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: oc_activity
+          plugin_id: entity_link
           label: ''
           exclude: false
           alter:
@@ -368,8 +278,6 @@ display:
           text: view
           output_url_as_text: false
           absolute: false
-          entity_type: oc_activity
-          plugin_id: entity_link
         edit_oc_activity:
           id: edit_oc_activity
           table: oc_activity
@@ -377,6 +285,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: oc_activity
+          plugin_id: entity_link_edit
           label: ''
           exclude: false
           alter:
@@ -421,8 +331,81 @@ display:
           text: edit
           output_url_as_text: false
           absolute: false
+      pager:
+        type: some
+        options:
+          offset: 0
+          items_per_page: 1
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: role
+        options:
+          role:
+            authenticated: authenticated
+      cache:
+        type: tag
+        options: {  }
+      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: "Trainer debrief will appear here once it is added.\r\n<div><a class=\"button\" href=\"/opencase/oc_activity/add/trainer_debrief?case_id={{ raw_arguments.oc_case }}&destination=/opencase/oc_case/{{ raw_arguments.oc_case }}\">Add trainer debrief</a></div\r\n"
+          tokenize: true
+      sorts: {  }
+      arguments:
+        oc_case:
+          id: oc_case
+          table: oc_activity_field_data
+          field: oc_case
+          relationship: none
+          group_type: group
+          admin_label: ''
           entity_type: oc_activity
-          plugin_id: entity_link_edit
+          entity_field: oc_case
+          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:
         type:
           id: type
@@ -431,6 +414,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: oc_activity
+          entity_field: type
+          plugin_id: bundle
           operator: in
           value:
             trainer_debrief: trainer_debrief
@@ -463,24 +449,76 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: oc_activity
-          entity_field: type
-          plugin_id: bundle
-      sorts: {  }
-      header: {  }
-      footer: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          tokenize: true
-          content: "Trainer debrief will appear here once it is added.\r\n<br />\r\n<a href=\"/opencase/oc_activity/add/trainer_debrief?case_id={{ raw_arguments.oc_case }}&destination=/opencase/oc_case/{{ raw_arguments.oc_case }}\">Add trainer debrief</a>\r\n"
-          plugin_id: text_custom
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: '{{ status }}'
+          default_row_class: true
+          columns:
+            field_trainer: field_trainer
+            activity_date_time: activity_date_time
+            status: status
+            view_oc_activity: view_oc_activity
+            edit_oc_activity: edit_oc_activity
+          default: '-1'
+          info:
+            field_trainer:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            activity_date_time:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            status:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            view_oc_activity:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            edit_oc_activity:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          override: true
+          sticky: false
+          summary: 'Trainer Debrief'
+          empty_table: false
+          caption: ''
+          description: ''
+      row:
+        type: fields
+        options:
+          default_field_elements: true
+          inline: {  }
+          separator: ''
+          hide_empty: false
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
       relationships:
         oc_case:
           id: oc_case
@@ -489,51 +527,13 @@ display:
           relationship: none
           group_type: group
           admin_label: Case
-          required: true
           entity_type: oc_activity
           entity_field: oc_case
           plugin_id: standard
-      arguments:
-        oc_case:
-          id: oc_case
-          table: oc_activity_field_data
-          field: oc_case
-          relationship: none
-          group_type: group
-          admin_label: ''
-          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
-            items_per_page: 25
-            override: false
-          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
-          entity_type: oc_activity
-          entity_field: oc_case
-          plugin_id: numeric
+          required: true
+      header: {  }
+      footer: {  }
       display_extenders: {  }
-      title: Debrief
     cache_metadata:
       max-age: -1
       contexts:
@@ -544,13 +544,13 @@ display:
       tags:
         - 'config:field.storage.oc_activity.field_trainer'
   block_1:
-    display_plugin: block
     id: block_1
     display_title: Block
+    display_plugin: block
     position: 1
     display_options:
-      display_extenders: {  }
       title: 'Trainer Debriefs'
+      display_extenders: {  }
     cache_metadata:
       max-age: -1
       contexts: