diff --git a/config/entity_extra_field.extra_field.oc_case.training.debriefs.yml b/config/entity_extra_field.extra_field.oc_case.training.debriefs.yml
index d24afed..eea2ca3 100644
--- a/config/entity_extra_field.extra_field.oc_case.training.debriefs.yml
+++ b/config/entity_extra_field.extra_field.oc_case.training.debriefs.yml
@@ -3,14 +3,16 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.storage.oc_activity.field_trainer
     - opencase_entities.oc_activity_type.trainer_debrief
+    - user.role.authenticated
   module:
     - datetime
     - opencase_cases
     - opencase_entities
     - user
 id: oc_case.training.debriefs
-label: Debriefs
+label: Debrief
 display_label: true
 name: debriefs
 description: ''
@@ -33,14 +35,14 @@ field_type_condition:
     id: route
     routes: ''
     negate: false
-  current_theme:
-    id: current_theme
-    theme: ''
-    negate: 0
   request_path:
     id: request_path
     pages: ''
     negate: false
+  current_theme:
+    id: current_theme
+    theme: ''
+    negate: 0
 field_conditions_all_pass: false
 display:
   type: view
diff --git a/config/field.storage.oc_case.field_training_status.yml b/config/field.storage.oc_case.field_training_status.yml
index cf6ef6a..33f1b60 100644
--- a/config/field.storage.oc_case.field_training_status.yml
+++ b/config/field.storage.oc_case.field_training_status.yml
@@ -27,6 +27,9 @@ settings:
     -
       value: post_training_materials_sent
       label: 'Post training materials sent'
+    -
+      value: client_no_show
+      label: 'Client no-show'
   allowed_values_function: ''
 module: options
 locked: false
diff --git a/config/views.view.debriefs.yml b/config/views.view.debriefs.yml
index 7a42fb4..c914520 100644
--- a/config/views.view.debriefs.yml
+++ b/config/views.view.debriefs.yml
@@ -14,7 +14,7 @@ dependencies:
 _core:
   default_config_hash: SxsvSdjmVHSg9OmH0pUqCTeGy9mRdcHyZ2YhOC5HBOc
 id: debriefs
-label: Debriefs
+label: Debrief
 module: views
 description: ''
 tag: ''
@@ -54,23 +54,10 @@ display:
           sort_asc_label: Asc
           sort_desc_label: Desc
       pager:
-        type: mini
+        type: some
         options:
-          items_per_page: 50
+          items_per_page: 1
           offset: 0
-          id: 0
-          total_pages: null
-          tags:
-            previous: ‹‹
-            next: ››
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
       style:
         type: table
         options:
@@ -79,15 +66,23 @@ display:
           default_row_class: true
           override: true
           sticky: false
-          caption: 'Trainer Debriefs'
+          caption: ''
           summary: 'Trainer Debrief'
           description: ''
           columns:
-            activity_date_time: activity_date_time
             field_trainer: field_trainer
-            view_oc_activity: view_oc_activity
+            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
@@ -95,7 +90,7 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
-            field_trainer:
+            status:
               sortable: false
               default_sort_order: asc
               align: ''
@@ -109,7 +104,7 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
-            status:
+            edit_oc_activity:
               sortable: false
               default_sort_order: asc
               align: ''
@@ -473,7 +468,8 @@ display:
           plugin_id: bundle
       sorts: {  }
       header: {  }
-      footer:
+      footer: {  }
+      empty:
         area_text_custom:
           id: area_text_custom
           table: views
@@ -483,22 +479,8 @@ display:
           admin_label: ''
           empty: true
           tokenize: true
-          content: "<a class=\"button\" href=\"/opencase/oc_activity/add/trainer_debrief?case_id={{ raw_arguments.oc_case }}\">Add trainer debrief</a><br />\r\n\r\n  \r\n<br />"
+          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
-      empty:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          tokenize: false
-          content:
-            value: 'Trainer debriefs will appear here once they are added.'
-            format: full_html
-          plugin_id: text
       relationships:
         oc_case:
           id: oc_case
@@ -551,13 +533,13 @@ display:
           entity_field: oc_case
           plugin_id: numeric
       display_extenders: {  }
+      title: Debrief
     cache_metadata:
       max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
-        - url.query_args
         - user.roles
       tags:
         - 'config:field.storage.oc_activity.field_trainer'
@@ -575,7 +557,6 @@ display:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
-        - url.query_args
         - user.roles
       tags:
         - 'config:field.storage.oc_activity.field_trainer'
diff --git a/config/views.view.evaluations.yml b/config/views.view.evaluations.yml
index da0d259..a3d65eb 100644
--- a/config/views.view.evaluations.yml
+++ b/config/views.view.evaluations.yml
@@ -78,13 +78,15 @@ display:
           default_row_class: true
           override: true
           sticky: false
-          caption: Evaluations
+          caption: ''
           summary: ''
           description: ''
           columns:
             name: name
             activity_date_time: activity_date_time
             status: status
+            view_oc_activity: view_oc_activity
+            edit_oc_activity: edit_oc_activity
           info:
             name:
               sortable: false
@@ -107,6 +109,20 @@ display:
               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: