diff --git a/config/core.entity_form_display.oc_activity.evaluation.default.yml b/config/core.entity_form_display.oc_activity.evaluation.default.yml
index 82dee90..9541807 100644
--- a/config/core.entity_form_display.oc_activity.evaluation.default.yml
+++ b/config/core.entity_form_display.oc_activity.evaluation.default.yml
@@ -26,86 +26,93 @@ mode: default
 content:
   activity_date_time:
     type: datetime_default
-    weight: -3
+    weight: 0
     region: content
     settings: {  }
     third_party_settings: {  }
   field_a:
     type: options_select
-    weight: 6
+    weight: 9
     region: content
     settings: {  }
     third_party_settings: {  }
   field_after_knowledge:
     type: options_select
-    weight: 7
+    weight: 10
     region: content
     settings: {  }
     third_party_settings: {  }
   field_after_skills:
     type: options_select
-    weight: 8
+    weight: 11
     region: content
     settings: {  }
     third_party_settings: {  }
   field_age:
     type: options_select
-    weight: 0
+    weight: 3
     region: content
     settings: {  }
     third_party_settings: {  }
   field_b:
     type: options_select
-    weight: 4
+    weight: 7
     region: content
     settings: {  }
     third_party_settings: {  }
   field_before_confidence:
     type: options_select
-    weight: 3
+    weight: 6
     region: content
     settings: {  }
     third_party_settings: {  }
   field_before_skills:
     type: options_select
-    weight: 5
+    weight: 8
     region: content
     settings: {  }
     third_party_settings: {  }
   field_d:
     type: options_select
-    weight: 2
+    weight: 5
     region: content
     settings: {  }
     third_party_settings: {  }
   field_ease:
     type: options_select
-    weight: 9
+    weight: 12
     region: content
     settings: {  }
     third_party_settings: {  }
   field_gender:
     type: options_select
-    weight: 1
+    weight: 4
     region: content
     settings: {  }
     third_party_settings: {  }
   field_relevance:
     type: options_select
-    weight: 10
+    weight: 13
     region: content
     settings: {  }
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: -3
+    weight: 1
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    weight: 14
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
   time_taken:
-    weight: -3
+    weight: 2
     region: content
     settings:
       placeholder: ''
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 47228b3..bc304eb 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
@@ -117,6 +117,13 @@ content:
     third_party_settings: {  }
     type: string_textarea
     region: content
+  status:
+    type: boolean_checkbox
+    weight: 12
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
 hidden:
   name: true
   time_taken: true
diff --git a/config/core.entity_form_display.oc_actor.trainer.default.yml b/config/core.entity_form_display.oc_actor.trainer.default.yml
index e80f123..953ab59 100644
--- a/config/core.entity_form_display.oc_actor.trainer.default.yml
+++ b/config/core.entity_form_display.oc_actor.trainer.default.yml
@@ -134,6 +134,13 @@ content:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    weight: 13
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
 hidden:
   full_name: true
   middle_names: true
diff --git a/config/core.entity_form_display.oc_case.project.default.yml b/config/core.entity_form_display.oc_case.project.default.yml
index d3d4e2f..239b691 100644
--- a/config/core.entity_form_display.oc_case.project.default.yml
+++ b/config/core.entity_form_display.oc_case.project.default.yml
@@ -41,6 +41,13 @@ content:
       progress_indicator: throbber
     region: content
     third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    weight: 3
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
 hidden:
   client: true
   field_total_fee: true
diff --git a/config/core.entity_form_display.oc_case.training.default.yml b/config/core.entity_form_display.oc_case.training.default.yml
index 2f6cd89..28bc1fe 100644
--- a/config/core.entity_form_display.oc_case.training.default.yml
+++ b/config/core.entity_form_display.oc_case.training.default.yml
@@ -86,6 +86,13 @@ content:
       progress_indicator: throbber
     region: content
     third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    weight: 8
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
 hidden:
   field_number_of_participants: true
   user_id: true
diff --git a/config/core.entity_form_display.oc_event.train_the_trainer.default.yml b/config/core.entity_form_display.oc_event.train_the_trainer.default.yml
new file mode 100644
index 0000000..583a407
--- /dev/null
+++ b/config/core.entity_form_display.oc_event.train_the_trainer.default.yml
@@ -0,0 +1,29 @@
+uuid: 12afe302-9a15-4267-b4f4-0a0a4d70977f
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_event_type.train_the_trainer
+  module:
+    - datetime
+id: oc_event.train_the_trainer.default
+targetEntityType: oc_event
+bundle: train_the_trainer
+mode: default
+content:
+  name:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    weight: 1
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
+hidden: {  }
diff --git a/config/core.entity_form_display.oc_organisation.client.default.yml b/config/core.entity_form_display.oc_organisation.client.default.yml
index b22f847..98d7ca6 100644
--- a/config/core.entity_form_display.oc_organisation.client.default.yml
+++ b/config/core.entity_form_display.oc_organisation.client.default.yml
@@ -28,7 +28,7 @@ bundle: client
 mode: default
 content:
   field_accreditation_date:
-    weight: 62
+    weight: 5
     settings: {  }
     third_party_settings: {  }
     type: datetime_default
@@ -64,7 +64,7 @@ content:
     type: options_buttons
     region: content
   field_location_festival_event:
-    weight: 8
+    weight: 9
     settings:
       size: 60
       placeholder: ''
@@ -72,28 +72,28 @@ content:
     type: string_textfield
     region: content
   field_number_of_events_per_year:
-    weight: 9
+    weight: 10
     settings:
       placeholder: ''
     third_party_settings: {  }
     type: number
     region: content
   field_number_of_staff:
-    weight: 7
+    weight: 8
     settings:
       placeholder: ''
     third_party_settings: {  }
     type: number
     region: content
   field_premises_capacity:
-    weight: 6
+    weight: 7
     settings:
       placeholder: ''
     third_party_settings: {  }
     type: number
     region: content
   field_tags:
-    weight: 10
+    weight: 11
     settings:
       match_operator: CONTAINS
       match_limit: 10
@@ -103,7 +103,7 @@ content:
     type: entity_reference_autocomplete
     region: content
   field_umbrella_client:
-    weight: 5
+    weight: 6
     settings:
       match_operator: CONTAINS
       match_limit: 10
@@ -120,5 +120,12 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    weight: 13
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
 hidden:
   field_images: true
diff --git a/config/core.entity_form_display.oc_organisation.partner_organisation.default.yml b/config/core.entity_form_display.oc_organisation.partner_organisation.default.yml
new file mode 100644
index 0000000..710325c
--- /dev/null
+++ b/config/core.entity_form_display.oc_organisation.partner_organisation.default.yml
@@ -0,0 +1,29 @@
+uuid: 83703815-32f2-4aa4-9bea-d5106ffa28b6
+langcode: en
+status: true
+dependencies:
+  config:
+    - opencase_entities.oc_organisation_type.partner_organisation
+  module:
+    - file
+id: oc_organisation.partner_organisation.default
+targetEntityType: oc_organisation
+bundle: partner_organisation
+mode: default
+content:
+  name:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    weight: 1
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
+hidden: {  }
diff --git a/config/core.entity_form_display.oc_organisation.umbrella_client.default.yml b/config/core.entity_form_display.oc_organisation.umbrella_client.default.yml
index d4e0039..5b1b415 100644
--- a/config/core.entity_form_display.oc_organisation.umbrella_client.default.yml
+++ b/config/core.entity_form_display.oc_organisation.umbrella_client.default.yml
@@ -16,7 +16,7 @@ bundle: umbrella_client
 mode: default
 content:
   field_tags:
-    weight: 62
+    weight: 2
     settings:
       match_operator: CONTAINS
       match_limit: 10
@@ -26,17 +26,24 @@ content:
     type: entity_reference_autocomplete
     region: content
   field_type_of_umbrella_client:
-    weight: -99
+    weight: 1
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   name:
     type: string_textfield
-    weight: -100
+    weight: 0
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    weight: 3
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
 hidden: {  }
diff --git a/config/core.entity_view_display.oc_organisation.client.default.yml b/config/core.entity_view_display.oc_organisation.client.default.yml
index a23ddbb..1a83ce6 100644
--- a/config/core.entity_view_display.oc_organisation.client.default.yml
+++ b/config/core.entity_view_display.oc_organisation.client.default.yml
@@ -29,16 +29,16 @@ bundle: client
 mode: default
 content:
   field_accreditation_date:
-    weight: 62
+    weight: 8
     label: above
     settings:
-      format_type: medium
       timezone_override: ''
+      format_type: short
     third_party_settings: {  }
     type: datetime_default
     region: content
   field_client_status:
-    weight: 6
+    weight: 7
     label: above
     settings:
       link: false
@@ -46,7 +46,7 @@ content:
     type: entity_reference_label
     region: content
   field_client_substatus:
-    weight: 5
+    weight: 6
     label: above
     settings:
       link: false
@@ -54,7 +54,7 @@ content:
     type: entity_reference_label
     region: content
   field_client_subtype:
-    weight: 4
+    weight: 5
     label: above
     settings:
       link: false
@@ -62,7 +62,7 @@ content:
     type: entity_reference_label
     region: content
   field_client_type:
-    weight: 3
+    weight: 4
     label: above
     settings:
       link: false
@@ -70,14 +70,14 @@ content:
     type: entity_reference_label
     region: content
   field_how_did_you_hear_about_us:
-    weight: 14
+    weight: 15
     label: above
     settings: {  }
     third_party_settings: {  }
     type: list_default
     region: content
   field_location_festival_event:
-    weight: 10
+    weight: 12
     label: above
     settings:
       link_to_entity: false
@@ -85,7 +85,7 @@ content:
     type: string
     region: content
   field_number_of_events_per_year:
-    weight: 11
+    weight: 13
     label: above
     settings:
       thousand_separator: ''
@@ -94,7 +94,7 @@ content:
     type: number_integer
     region: content
   field_number_of_staff:
-    weight: 9
+    weight: 11
     label: above
     settings:
       thousand_separator: ''
@@ -103,7 +103,7 @@ content:
     type: number_integer
     region: content
   field_premises_capacity:
-    weight: 8
+    weight: 10
     label: above
     settings:
       thousand_separator: ''
@@ -112,7 +112,7 @@ content:
     type: number_integer
     region: content
   field_tags:
-    weight: 12
+    weight: 14
     label: above
     settings:
       link: false
@@ -120,7 +120,7 @@ content:
     type: entity_reference_label
     region: content
   field_umbrella_client:
-    weight: 7
+    weight: 9
     label: above
     settings:
       link: true
@@ -129,24 +129,24 @@ content:
     region: content
   linked_clients:
     weight: 0
+    region: content
     settings: {  }
     third_party_settings: {  }
-    region: content
   name:
     label: hidden
     type: string
-    weight: 2
+    weight: 3
     region: content
     settings:
       link_to_entity: false
     third_party_settings: {  }
   projects:
-    weight: 1
+    weight: 2
     region: content
     settings: {  }
     third_party_settings: {  }
   trainings:
-    weight: 0
+    weight: 1
     region: content
     settings: {  }
     third_party_settings: {  }
diff --git a/config/user.role.gno_standard_user.yml b/config/user.role.gno_standard_user.yml
index 0b262e2..e604d5c 100644
--- a/config/user.role.gno_standard_user.yml
+++ b/config/user.role.gno_standard_user.yml
@@ -20,14 +20,8 @@ permissions:
   - 'create paragraph content availability'
   - 'create paragraph content trainer'
   - 'create terms in tags'
-  - 'delete activity entities'
-  - 'delete case entities'
-  - 'delete equal opps entities'
-  - 'delete organisation entities'
-  - 'delete organisation relation entities'
   - 'delete paragraph content availability'
   - 'delete paragraph content trainer'
-  - 'delete trainer entities'
   - 'edit activity entities'
   - 'edit case entities'
   - 'edit equal opps entities'
diff --git a/config/views.view.all_clients.yml b/config/views.view.all_clients.yml
index aebd223..a344c2f 100644
--- a/config/views.view.all_clients.yml
+++ b/config/views.view.all_clients.yml
@@ -83,6 +83,73 @@ display:
             offset_label: Offset
       style:
         type: table
+        options:
+          grouping: {  }
+          row_class: '{{ status }}'
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            name: name
+            field_client_type: field_client_type
+            field_client_subtype: field_client_subtype
+            field_client_status: field_client_status
+            field_client_substatus: field_client_substatus
+            field_tags: field_tags
+            status: status
+          info:
+            name:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            field_client_type:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            field_client_subtype:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            field_client_status:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            field_client_substatus:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            field_tags:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            status:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: '-1'
+          empty_table: false
       row:
         type: fields
       fields:
@@ -466,20 +533,74 @@ display:
           separator: ', '
           field_api_classes: false
           plugin_id: field
-      filters:
         status:
-          value: '1'
+          id: status
           table: oc_organisation_field_data
           field: status
-          plugin_id: boolean
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Publishing status'
+          exclude: true
+          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: boolean
+          settings:
+            format: default
+            format_custom_true: ''
+            format_custom_false: ''
+          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
           entity_type: oc_organisation
           entity_field: status
-          id: status
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-          group: 1
+          plugin_id: field
+      filters:
         type:
           id: type
           table: oc_organisation_field_data
@@ -771,134 +892,11 @@ display:
       defaults:
         footer: false
         empty: false
-        filters: false
-        filter_groups: false
+        filters: true
+        filter_groups: true
         title: false
         header: false
       empty: {  }
-      filters:
-        status:
-          value: '1'
-          table: oc_organisation_field_data
-          field: status
-          plugin_id: boolean
-          entity_type: oc_organisation
-          entity_field: status
-          id: status
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-          group: 1
-        type:
-          id: type
-          table: oc_organisation_field_data
-          field: type
-          value:
-            client: client
-          entity_type: oc_organisation
-          entity_field: type
-          plugin_id: bundle
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        field_client_status_target_id:
-          id: field_client_status_target_id
-          table: oc_organisation__field_client_status
-          field: field_client_status_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: not
-          value:
-            41: 41
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          type: select
-          limit: true
-          vid: client_status
-          hierarchy: false
-          error_message: true
-          plugin_id: taxonomy_index_tid
-        field_client_substatus_target_id:
-          id: field_client_substatus_target_id
-          table: oc_organisation__field_client_substatus
-          field: field_client_substatus_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          operator: not
-          value:
-            25: 25
-            26: 26
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          type: select
-          limit: true
-          vid: clie
-          hierarchy: false
-          error_message: true
-          plugin_id: taxonomy_index_tid
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
       title: 'All clients'
       header:
         display_link:
@@ -918,7 +916,6 @@ display:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url.query_args
-        - user
         - user.roles
       tags:
         - 'config:field.storage.oc_organisation.field_client_status'
diff --git a/config/views.view.projects.yml b/config/views.view.projects.yml
index 3d1901c..7ce8974 100644
--- a/config/views.view.projects.yml
+++ b/config/views.view.projects.yml
@@ -546,7 +546,7 @@ display:
           type: datetime_default
           settings:
             timezone_override: ''
-            format_type: medium
+            format_type: short
           group_column: value
           group_columns: {  }
           group_rows: true