diff --git a/config/core.entity_view_display.oc_case.project.default.yml b/config/core.entity_view_display.oc_case.project.default.yml
index 60a7b39..4b05f95 100644
--- a/config/core.entity_view_display.oc_case.project.default.yml
+++ b/config/core.entity_view_display.oc_case.project.default.yml
@@ -18,7 +18,7 @@ mode: default
 content:
   client:
     type: entity_reference_label
-    weight: 2
+    weight: 3
     region: content
     label: above
     settings:
@@ -30,7 +30,7 @@ content:
     settings: {  }
     third_party_settings: {  }
   field_contract_signed_date:
-    weight: 3
+    weight: 4
     label: above
     settings:
       timezone_override: ''
@@ -38,17 +38,6 @@ content:
     third_party_settings: {  }
     type: datetime_default
     region: content
-  field_total_fee:
-    weight: 4
-    label: above
-    settings:
-      thousand_separator: ''
-      decimal_separator: .
-      scale: 2
-      prefix_suffix: true
-    third_party_settings: {  }
-    type: number_decimal
-    region: content
   files:
     label: above
     settings:
@@ -57,9 +46,20 @@ content:
     weight: 6
     third_party_settings: {  }
     type: file_default
-  trainings:
+  total_fee:
+    type: number_decimal
     weight: 1
     region: content
+    label: above
+    settings:
+      thousand_separator: ''
+      decimal_separator: .
+      scale: 2
+      prefix_suffix: true
+    third_party_settings: {  }
+  trainings:
+    weight: 2
+    region: content
     settings: {  }
     third_party_settings: {  }
   user_id:
@@ -71,5 +71,6 @@ content:
     third_party_settings: {  }
 hidden:
   field_fee: true
+  field_total_fee: true
   notes: true
   search_api_excerpt: true
diff --git a/config/views.view.all_clients.yml b/config/views.view.all_clients.yml
index 192c1af..46857d9 100644
--- a/config/views.view.all_clients.yml
+++ b/config/views.view.all_clients.yml
@@ -14,11 +14,6 @@ dependencies:
     - taxonomy.vocabulary.clie
     - taxonomy.vocabulary.client_status
     - user.role.authenticated
-  content:
-    - 'taxonomy_term:clie:98d1370b-e29f-45fb-b053-b911c2538870'
-    - 'taxonomy_term:clie:9915606c-1775-4f68-be24-ffaa629ee0b1'
-    - 'taxonomy_term:clie:c0c6397d-4f7c-4077-af51-1860ccad26a3'
-    - 'taxonomy_term:client_status:057c3514-8413-463f-989e-cd8deda6c71c'
   module:
     - opencase_entities
     - taxonomy
@@ -866,7 +861,7 @@ display:
           admin_label: ''
           empty: true
           tokenize: true
-          content: '<a class="button" href="/opencase/oc_organisation/add/client?umbrella_client_id={{ raw_arguments.field_umbrella_client_target_id }}">Add client</a><br /><br />'
+          content: '<a class="button" href="/opencase/oc_organisation/add/client?umbrella_client_id={{ raw_arguments.field_umbrella_client_target_id }}&destination=/opencase/oc_organisation/{{ raw_arguments.field_umbrella_client_target_id }}">Add client</a><br /><br />'
           plugin_id: text_custom
       empty:
         area_text_custom:
diff --git a/config/views.view.case_provisions.yml b/config/views.view.case_provisions.yml
index 0f48fa5..64da6dc 100644
--- a/config/views.view.case_provisions.yml
+++ b/config/views.view.case_provisions.yml
@@ -408,6 +408,59 @@ display:
           entity_type: oc_case_provision
           entity_field: oc_case_provider_role
           plugin_id: field
+        edit_oc_case_provision:
+          id: edit_oc_case_provision
+          table: oc_case_provision
+          field: edit_oc_case_provision
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          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: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          text: edit
+          output_url_as_text: false
+          absolute: false
+          entity_type: oc_case_provision
+          plugin_id: entity_link_edit
       filters:
         status:
           value: '1'
@@ -434,7 +487,7 @@ display:
           admin_label: ''
           empty: true
           tokenize: true
-          content: '<a class="button" href="/admin/opencase/oc_case_provision/add/trainer?case_id={{ raw_arguments.oc_case }}">Add trainer</a><br /><br />'
+          content: '<a class="button" href="/admin/opencase/oc_case_provision/add/trainer?case_id={{ raw_arguments.oc_case }}&destination=/opencase/oc_case/{{ raw_arguments.oc_case }}">Add trainer</a><br /><br />'
           plugin_id: text_custom
       empty:
         area:
diff --git a/config/views.view.debriefs.yml b/config/views.view.debriefs.yml
index c041490..7a42fb4 100644
--- a/config/views.view.debriefs.yml
+++ b/config/views.view.debriefs.yml
@@ -126,6 +126,69 @@ display:
           hide_empty: false
           default_field_elements: true
       fields:
+        field_trainer:
+          id: field_trainer
+          table: oc_activity__field_trainer
+          field: field_trainer
+          relationship: none
+          group_type: group
+          admin_label: ''
+          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: false
+          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
+          plugin_id: field
         activity_date_time:
           id: activity_date_time
           table: oc_activity_field_data
@@ -192,77 +255,6 @@ display:
           entity_type: oc_activity
           entity_field: activity_date_time
           plugin_id: field
-        field_trainer:
-          id: field_trainer
-          table: oc_activity__field_trainer
-          field: field_trainer
-          relationship: none
-          group_type: group
-          admin_label: ''
-          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: false
-          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
-          plugin_id: field
-        view_oc_activity:
-          id: view_oc_activity
-          table: oc_activity
-          field: view_oc_activity
-          entity_type: oc_activity
-          plugin_id: entity_link
-          output_url_as_text: false
-          absolute: false
         status:
           id: status
           table: oc_activity_field_data
@@ -330,6 +322,112 @@ display:
           entity_type: oc_activity
           entity_field: status
           plugin_id: field
+        view_oc_activity:
+          id: view_oc_activity
+          table: oc_activity
+          field: view_oc_activity
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          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: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          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
+          field: edit_oc_activity
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          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: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          text: edit
+          output_url_as_text: false
+          absolute: false
+          entity_type: oc_activity
+          plugin_id: entity_link_edit
       filters:
         type:
           id: type
diff --git a/config/views.view.evaluations.yml b/config/views.view.evaluations.yml
index 959ae37..da0d259 100644
--- a/config/views.view.evaluations.yml
+++ b/config/views.view.evaluations.yml
@@ -315,6 +315,112 @@ display:
           entity_type: oc_activity
           entity_field: status
           plugin_id: field
+        view_oc_activity:
+          id: view_oc_activity
+          table: oc_activity
+          field: view_oc_activity
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          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: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          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
+          field: edit_oc_activity
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          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: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          text: edit
+          output_url_as_text: false
+          absolute: false
+          entity_type: oc_activity
+          plugin_id: entity_link_edit
       filters:
         type:
           id: type
@@ -340,7 +446,7 @@ display:
           admin_label: ''
           empty: true
           tokenize: true
-          content: "<a class=\"button\" href=\"/opencase/oc_activity/add/evaluation?case_id={{ raw_arguments.oc_case }}\">Add evaluation</a>\r\n<br />"
+          content: "<a class=\"button\" href=\"/opencase/oc_activity/add/evaluation?case_id={{ raw_arguments.oc_case }}&destination=/opencase/oc_case/{{ raw_arguments.oc_case }}\">Add evaluation</a>\r\n<br />"
           plugin_id: text_custom
       empty:
         area:
diff --git a/config/views.view.fees.yml b/config/views.view.fees.yml
index 12fb4e9..25f2a75 100644
--- a/config/views.view.fees.yml
+++ b/config/views.view.fees.yml
@@ -276,6 +276,59 @@ display:
           entity_type: oc_case_fee
           entity_field: oc_fee_category
           plugin_id: field
+        edit_oc_case_fee:
+          id: edit_oc_case_fee
+          table: oc_case_fee
+          field: edit_oc_case_fee
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Edit
+          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
+          text: edit
+          output_url_as_text: false
+          absolute: false
+          entity_type: oc_case_fee
+          plugin_id: entity_link_edit
       filters:
         status:
           value: '1'
diff --git a/config/views.view.organisation_relations.yml b/config/views.view.organisation_relations.yml
index a253eef..7c634b9 100644
--- a/config/views.view.organisation_relations.yml
+++ b/config/views.view.organisation_relations.yml
@@ -216,7 +216,7 @@ display:
           admin_label: ''
           empty: true
           tokenize: true
-          content: '<a class="button" href="/opencase/oc_organisation_relation/add/link_between_clients?organisation_id={{ raw_arguments.organisations_target_id }} ">Add linked client</a>'
+          content: '<a class="button" href="/opencase/oc_organisation_relation/add/link_between_clients?organisation_id={{ raw_arguments.organisations_target_id }}&destination=/opencase/oc_organisation/{{ raw_arguments.organisations_target_id }}">Add linked client</a>'
           plugin_id: text_custom
       empty: {  }
       relationships: {  }
diff --git a/config/views.view.projects.yml b/config/views.view.projects.yml
index 7438e68..169aedc 100644
--- a/config/views.view.projects.yml
+++ b/config/views.view.projects.yml
@@ -426,7 +426,7 @@ display:
           admin_label: ''
           empty: true
           tokenize: true
-          content: '<a class="button" href="/opencase/oc_case/add/project?client_id={{ raw_arguments.client }}">Add project</a><br /><br />'
+          content: '<a class="button" href="/opencase/oc_case/add/project?client_id={{ raw_arguments.client }}&destination=/opencase/oc_organisation/{{ raw_arguments.client }}">Add project</a><br /><br />'
           plugin_id: text_custom
       fields:
         name:
diff --git a/config/views.view.trainings.yml b/config/views.view.trainings.yml
index 5cd60df..5923d74 100644
--- a/config/views.view.trainings.yml
+++ b/config/views.view.trainings.yml
@@ -606,7 +606,7 @@ display:
           admin_label: ''
           empty: true
           tokenize: true
-          content: '<a class="button" href="/opencase/oc_case/add/training?client_id={{ raw_arguments.client }}">Add training</a><br /><br />'
+          content: '<a class="button" href="/opencase/oc_case/add/training?client_id={{ raw_arguments.client }}&destination=/opencase/oc_organisation/{{ raw_arguments.client }}">Add training</a><br /><br />'
           plugin_id: text_custom
       empty:
         area_text_custom:
@@ -1814,7 +1814,7 @@ display:
           admin_label: ''
           empty: true
           tokenize: true
-          content: '<a class="button" href="/opencase/oc_case/add/training?client_id={{ raw_arguments.client }}">Add training</a><br /><br />'
+          content: '<a class="button" href="/opencase/oc_case/add/training?client_id={{ raw_arguments.client }}&destination=/opencase/oc_organisation/{{ raw_arguments.client }}">Add training</a><br /><br />'
           plugin_id: text_custom
       arguments:
         client: