diff --git a/ui/src/app/entity-view/entity-view.routes.js b/ui/src/app/entity-view/entity-view.routes.js
index 4da8c80500..c55add94fa 100644
--- a/ui/src/app/entity-view/entity-view.routes.js
+++ b/ui/src/app/entity-view/entity-view.routes.js
@@ -68,4 +68,5 @@ export default function EntityViewRoutes($stateProvider, types) {
                 label: '{"icon": "view_quilt", "label": "{{ vm.customerEntityViewsTitle }}", "translate": "false"}'
             }
         });
+
 }
diff --git a/ui/src/app/import-export/import-export.service.js b/ui/src/app/import-export/import-export.service.js
index 04aa8805a1..dc0fbf1ea7 100644
--- a/ui/src/app/import-export/import-export.service.js
+++ b/ui/src/app/import-export/import-export.service.js
@@ -257,9 +257,6 @@ export default function ImportExport($log, $translate, $q, $mdDialog, $document,
             ruleChain.firstRuleNodeId = null;
         }
         ruleChain.root = false;
-        delete ruleChain.assignedEdgesText;
-        delete ruleChain.assignedEdges;
-        delete ruleChain.assignedEdgesIds;
         return ruleChain;
     }
 
diff --git a/ui/src/app/locale/locale.constant-de_DE.json b/ui/src/app/locale/locale.constant-de_DE.json
index 62f0bc5156..9e822188ee 100644
--- a/ui/src/app/locale/locale.constant-de_DE.json
+++ b/ui/src/app/locale/locale.constant-de_DE.json
@@ -67,7 +67,7 @@
     "general-settings": "Allgemeine Einstellungen",
     "outgoing-mail": "E-Mail Versand",
     "outgoing-mail-settings": "Konfiguration des Postausgangsservers",
-    "system-settings": "Systeminstellungen",
+    "system-settings": "Systemeinstellungen",
     "test-mail-sent": "Test E-Mail wurde erfolgreich versendet!",
     "base-url": "Basis-URL",
     "base-url-required": "Basis-URL ist erforderlich.",
diff --git a/ui/src/app/rulechain/rulechain-fieldset.tpl.html b/ui/src/app/rulechain/rulechain-fieldset.tpl.html
index a85a423358..4afd6ee96e 100644
--- a/ui/src/app/rulechain/rulechain-fieldset.tpl.html
+++ b/ui/src/app/rulechain/rulechain-fieldset.tpl.html
@@ -36,11 +36,6 @@
 </div>
 
 <md-content class="md-padding tb-rulechain-fieldset" layout="column">
-    <md-input-container class="md-block"
-                        ng-show="!isEdit && ruleChain.assignedEdgesText && ruleChainScope === 'tenant'">
-        <label translate>rulechain.assigned-to-edges</label>
-        <input ng-model="ruleChain.assignedEdgesText" disabled>
-    </md-input-container>
     <fieldset ng-disabled="$root.loading || !isEdit || isReadOnly">
         <md-input-container class="md-block">
             <label translate>rulechain.name</label>
diff --git a/ui/src/app/rulechain/rulechain.directive.js b/ui/src/app/rulechain/rulechain.directive.js
index dd6405c1c9..a4951c2f8b 100644
--- a/ui/src/app/rulechain/rulechain.directive.js
+++ b/ui/src/app/rulechain/rulechain.directive.js
@@ -22,7 +22,6 @@ import ruleChainFieldsetTemplate from './rulechain-fieldset.tpl.html';
 /*@ngInject*/
 export default function RuleChainDirective($compile, $templateCache, $mdDialog, $document, $q, $translate, types, toast) {
     var linker = function (scope, element) {
-
         var template = $templateCache.get(ruleChainFieldsetTemplate);
         element.html(template);
 
diff --git a/ui/src/app/rulechain/rulechains.controller.js b/ui/src/app/rulechain/rulechains.controller.js
index 300e7cbc80..fe19cad5ca 100644
--- a/ui/src/app/rulechain/rulechains.controller.js
+++ b/ui/src/app/rulechain/rulechains.controller.js
@@ -22,8 +22,8 @@ import addRuleChainsToEdgeTemplate from "./add-rulechains-to-edge.tpl.html";
 /* eslint-enable import/no-unresolved, import/default */
 
 /*@ngInject*/
-export default function RuleChainsController(ruleChainService, userService, edgeService, importExport, $state,
-                                             $stateParams, $filter, $translate, $mdDialog, $document, $q, types) {
+export default function RuleChainsController(ruleChainService, userService, importExport, $state, $stateParams, $filter, $translate, $mdDialog, types,
+                                             $document, $q, edgeService) {
 
     var vm = this;
     var edgeId = $stateParams.edgeId;
@@ -203,21 +203,21 @@ export default function RuleChainsController(ruleChainService, userService, edge
 
             ruleChainActionsList.push({
                 onAction: function ($event, item) {
-                    vm.grid.deleteItem($event, item);
+                    setDefaultRootEdgeRuleChain($event, item);
                 },
-                name: function() { return $translate.instant('action.delete') },
-                details: function() { return $translate.instant('rulechain.delete') },
-                icon: "delete",
+                name: function() { return $translate.instant('rulechain.set-default-root-edge') },
+                details: function() { return $translate.instant('rulechain.set-default-root-edge') },
+                icon: "flag",
                 isEnabled: isNonRootRuleChain
             });
 
             ruleChainActionsList.push({
                 onAction: function ($event, item) {
-                    setDefaultRootEdgeRuleChain($event, item);
+                    vm.grid.deleteItem($event, item);
                 },
-                name: function() { return $translate.instant('rulechain.set-default-root-edge') },
-                details: function() { return $translate.instant('rulechain.set-default-root-edge') },
-                icon: "flag",
+                name: function() { return $translate.instant('action.delete') },
+                details: function() { return $translate.instant('rulechain.delete') },
+                icon: "delete",
                 isEnabled: isNonRootRuleChain
             });
 
@@ -395,13 +395,13 @@ export default function RuleChainsController(ruleChainService, userService, edge
         if ($event) {
             $event.stopPropagation();
         }
-
+        var ruleChainParams = {ruleChainId: ruleChain.id.id};
         if (vm.ruleChainsScope === 'edge') {
-            $state.go('home.edges.ruleChains.ruleChain', {ruleChainId: ruleChain.id.id, edgeId: vm.edge.id.id});
+            $state.go('home.edges.ruleChains.ruleChain', {...ruleChainParams, edgeId: vm.edge.id.id});
         } else if (vm.ruleChainsScope === 'edges') {
-            $state.go('home.ruleChains.edge.ruleChain', {ruleChainId: ruleChain.id.id});
+            $state.go('home.ruleChains.edge.ruleChain', ruleChainParams);
         } else {
-            $state.go('home.ruleChains.core.ruleChain', {ruleChainId: ruleChain.id.id});
+            $state.go('home.ruleChains.core.ruleChain', ruleChainParams);
         }
     }
 
diff --git a/ui/src/app/rulechain/rulechains.tpl.html b/ui/src/app/rulechain/rulechains.tpl.html
index fae3e8d63d..9880ac0213 100644
--- a/ui/src/app/rulechain/rulechains.tpl.html
+++ b/ui/src/app/rulechain/rulechains.tpl.html
@@ -24,7 +24,6 @@
         <md-tab label="{{ 'rulechain.details' | translate }}">
             <tb-rule-chain rule-chain="vm.grid.operatingItem()"
                      is-edit="vm.grid.detailsConfig.isDetailsEditMode"
-                     rule-chain-scope="vm.ruleChainsScope"
                      is-read-only="vm.grid.isDetailsReadOnly(vm.grid.operatingItem())"
                      the-form="vm.grid.detailsForm"
                      on-set-root-rule-chain="vm.setRootRuleChain(event, vm.grid.detailsConfig.currentItem)"