diff --git a/entity/PermissionAction_entity/onValidation.js b/entity/PermissionAction_entity/onValidation.js
index be4d539d44a1e2492d85480020e1b3fdba5968ac..4561e8413eb322f4752b0d3866e73aa4f11ddf29 100644
--- a/entity/PermissionAction_entity/onValidation.js
+++ b/entity/PermissionAction_entity/onValidation.js
@@ -5,5 +5,5 @@ import("system.result");
 var actionTitle = vars.get("$field.ACTION");
 
 if (actionTitle == "null" || actionTitle == undefined || actionTitle == null || actionTitle == "") {
-    result.string(translate.text("Empty actions are not allowed!"));
+    result.string(translate.text("Empty actions are invalid!"));
 }
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/entityfields/entity/onValueChange.js b/entity/PermissionDetail_entity/entityfields/entity/onValueChange.js
index 11440115d21a7626a41c66c47e40a9eef5044612..c3f90074fe89fcccf56262ba666c40d794a3567a 100644
--- a/entity/PermissionDetail_entity/entityfields/entity/onValueChange.js
+++ b/entity/PermissionDetail_entity/entityfields/entity/onValueChange.js
@@ -1,3 +1,3 @@
 import("system.neon");
 
-neon.refresh();
\ No newline at end of file
+neon.refresh(["$field.FIELD"]);
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/entityfields/permissionactions/onValidation.js b/entity/PermissionDetail_entity/entityfields/permissionactions/onValidation.js
index 2da1099bbc36332519d87a91ed9da6a9a7ed105e..4299926003dad59ea8773275f1f41d40973e3adf 100644
--- a/entity/PermissionDetail_entity/entityfields/permissionactions/onValidation.js
+++ b/entity/PermissionDetail_entity/entityfields/permissionactions/onValidation.js
@@ -32,7 +32,7 @@ for each (let row in insertedRows) {
 }
 
 if (deletedRows.length == actionsAsStringArray.length && changedRows.length == 0 && insertedRows.length == 0) {
-    result.string(translate.text("Permissions without actions are not allowed!"));
+    result.string(translate.text("Permissions without actions are invalid!"));
 }
 
 if (PermissionUtil.permissionExists(permId)) {
diff --git a/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
index b0aa5ab5592d45f36b45bdab7dbe30b66b166293..e8b93be4640d2e0b43feb7ea936ec38502217e59 100644
--- a/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js
@@ -106,7 +106,7 @@ if (selectedPermission == null) {
     }
 }
 
-result.object(res.sort(sortResultsAfterCondition).sort(sortResultsAfterAccessTypes));
+result.object(res.sort(sortResultsByCondition).sort(sortResultsByAccessTypes));
 
 function prepareResultArray(pEntry, pRes) {
     var rootPermission = "";
@@ -162,7 +162,7 @@ function sortActions(actions, accesstype) {
 }
 
 // sorts result array: Entity -> Records -> Fields
-function sortResultsAfterAccessTypes(a, b) {
+function sortResultsByAccessTypes(a, b) {
     if (a[6] == b[6] && a[6] != "F" && a[6] != "R")
         return 0;
     else if (a[6] == "E")
@@ -186,7 +186,7 @@ function sortResultsAfterAccessTypes(a, b) {
 }
 
 // sorts result array: default permission -> conditional permission
-function sortResultsAfterCondition(a, b) {
+function sortResultsByCondition(a, b) {
     var noCond = "{\"entity\":\"" + vars.get("$field.ENTITY") + "\",\"filter\":{\"type\":\"group\",\"operator\":\"AND\",\"childs\":[]}}";
     if (a[4] == "" || a[4] == noCond) {
         return -1;
diff --git a/entity/PermissionDetail_entity/recordcontainers/jdito/onDelete.js b/entity/PermissionDetail_entity/recordcontainers/jdito/onDelete.js
index 54100375b14cef0becd2fabc1ca5fc5a5ab15f9f..56cc8b74a1c743de74d9aeaf5a9c8d4ec8c806e4 100644
--- a/entity/PermissionDetail_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/PermissionDetail_entity/recordcontainers/jdito/onDelete.js
@@ -52,5 +52,4 @@ if (PermissionUtil.setIsEmpty(parentPermSetId)) {
     db.deleteData("ASYS_PERMISSIONSET", sqlCondDelPermSet, alias); // delete empty permissionset
 }
 
-neon.refreshAll();
 tools.clearPermissionCache();
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js b/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js
index cacdde1e352e2d9859d8f39f20fb9e2f3af4378c..105a129772bb983a78f293abf7112fdd995809ed 100644
--- a/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js
@@ -32,5 +32,4 @@ if (diff.length > 0) {
 PermissionUtil.updateIfDiff(permissionid, permCond, "COND", "ASYS_PERMISSION"); // updates COND if the new cond is different to COND in DB
 PermissionUtil.updateIfDiff(permissionid, permCondType, "CONDTYPE", "ASYS_PERMISSION"); // updates CONDTYPE if the new condtype is different to CONDTYPE in DB
 
-neon.refreshAll(); 
 tools.clearPermissionCache();
\ No newline at end of file
diff --git a/neonView/PermissionDetailPreview_view/PermissionDetailPreview_view.aod b/neonView/PermissionDetailPreview_view/PermissionDetailPreview_view.aod
index 6e25ef4aaf948b31092634b0e85be4e93391e335..bfb6897c91b80abc5b7a9091c7eacabec0e3aade 100644
--- a/neonView/PermissionDetailPreview_view/PermissionDetailPreview_view.aod
+++ b/neonView/PermissionDetailPreview_view/PermissionDetailPreview_view.aod
@@ -3,9 +3,9 @@
   <name>PermissionDetailPreview_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
-    <noneLayout>
+    <headerFooterLayout>
       <name>layout</name>
-    </noneLayout>
+    </headerFooterLayout>
   </layout>
   <children>
     <cardViewTemplate>