Edge import finished

@@ -1278,10 +1278,14 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
         }
 
         if (entityType === types.entityType.edge) {
-            newEntity.edgeLicenseKey = entityParameters.edgeLicenseKey;
-            newEntity.cloudEndpoint = entityParameters.cloudEndpoint;
-            newEntity.routingKey = entityParameters.routingKey;
-            newEntity.secret = entityParameters.secret;
+            Object.assign(newEntity,
+                {
+                    edgeLicenseKey: entityParameters.edgeLicenseKey,
+                    cloudEndpoint: entityParameters.cloudEndpoint,
+                    routingKey: entityParameters.routingKey,
+                    secret: entityParameters.secret
+                }
+            );
         }
 
         let saveEntityPromise = getEntitySavePromise(entityType, newEntity, config);

@@ -133,15 +133,19 @@ function TableColumnsAssignmentController($scope, types, $timeout) {
                 vm.columnTypes.name.disable = isSelectName;
                 vm.columnTypes.type.disable = isSelectType;
                 vm.columnTypes.label.disable = isSelectLabel;
-                vm.columnTypes.gateway.disable = isSelectGateway;
+                if (angular.isDefined(vm.columnTypes.gateway)) {
+                    vm.columnTypes.gateway.disable = isSelectGateway;
+                }
                 vm.columnTypes.description.disable = isSelectDescription;
                 if (angular.isDefined(vm.columnTypes.accessToken)) {
                     vm.columnTypes.accessToken.disable = isSelectCredentials;
                 }
-                vm.columnTypes.edgeLicenseKey.disable = isSelectEdgeLicenseKey;
-                vm.columnTypes.cloudEndpoint.disable = isSelectCloudEndpoint;
-                vm.columnTypes.routingKey.disable = isSelectRoutingKey;
-                vm.columnTypes.secret.disable = isSelectSecret;
+                if (vm.entityType === types.entityType.edge) {
+                    vm.columnTypes.edgeLicenseKey.disable = isSelectEdgeLicenseKey;
+                    vm.columnTypes.cloudEndpoint.disable = isSelectCloudEndpoint;
+                    vm.columnTypes.routingKey.disable = isSelectRoutingKey;
+                    vm.columnTypes.secret.disable = isSelectSecret;
+                }
             });
         }
     }, true);

@@ -1405,9 +1405,9 @@
             "access-token": "Access token",
             "isgateway": "Is Gateway",
             "description": "Description",
-            "edgeLicenseKey": "Edge license key",
-            "cloudEndpoint": "Cloud endpoint",
-            "routingKey": "Edge routing key",
+            "edgeLicenseKey": "License Key",
+            "cloudEndpoint": "Cloud Endpoint",
+            "routingKey": "Edge key",
             "secret": "Edge secret"
         },
         "stepper-text":{