diff --git a/src/app/components/bundled-controller-finder/bundled-controller-finder.component.spec.ts b/src/app/components/bundled-controller-finder/bundled-controller-finder.component.spec.ts
index 9dec69cf..84300410 100644
--- a/src/app/components/bundled-controller-finder/bundled-controller-finder.component.spec.ts
+++ b/src/app/components/bundled-controller-finder/bundled-controller-finder.component.spec.ts
@@ -4,7 +4,7 @@ import { By } from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ProgressService } from '../../common/progress/progress.service';
-import{ Controller } from '../../models/controller';
+import { Controller } from '../../models/controller';
 import { ControllerService } from '../../services/controller.service';
 import { MockedControllerService } from '../../services/controller.service.spec';
 import { MockedProgressService } from '../project-map/project-map.component.spec';
@@ -24,7 +24,7 @@ describe('BundledControllerFinderComponent', () => {
       navigate: jasmine.createSpy('navigate'),
     };
 
-    
+
 
     controllerServiceMock = jasmine.createSpyObj<ControllerService>([
       "getLocalController"
diff --git a/src/app/components/bundled-controller-finder/bundled-controller-finder.component.ts b/src/app/components/bundled-controller-finder/bundled-controller-finder.component.ts
index cfa332b0..10425ca7 100644
--- a/src/app/components/bundled-controller-finder/bundled-controller-finder.component.ts
+++ b/src/app/components/bundled-controller-finder/bundled-controller-finder.component.ts
@@ -2,7 +2,7 @@ import { DOCUMENT } from '@angular/common';
 import { Component, Inject, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { ProgressService } from '../../common/progress/progress.service';
-import{ Controller } from '../../models/controller';
+import { Controller } from '../../models/controller';
 import { ControllerService } from '../../services/controller.service';
 
 @Component({
@@ -22,7 +22,7 @@ export class BundledControllerFinderComponent implements OnInit {
     this.progressService.activate();
     setTimeout(() => {
       let port;
-      
+
       if (parseInt(this.document.location.port, 10)) {
         port = parseInt(this.document.location.port, 10);
       } else if (this.document.location.protocol == "https:") {
diff --git a/src/app/components/controllers/controller-discovery/controller-discovery.component.spec.ts b/src/app/components/controllers/controller-discovery/controller-discovery.component.spec.ts
index ddd845b4..56effa01 100644
--- a/src/app/components/controllers/controller-discovery/controller-discovery.component.spec.ts
+++ b/src/app/components/controllers/controller-discovery/controller-discovery.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testin
 import { MatCardModule } from '@angular/material/card';
 import { MatDividerModule } from '@angular/material/divider';
 import { Observable } from 'rxjs/Rx';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { Version } from '../../../models/version';
 import { ControllerDatabase } from '../../../services/controller.database';
 import { ControllerService } from '../../../services/controller.service';
diff --git a/src/app/components/direct-link/direct-link.component.ts b/src/app/components/direct-link/direct-link.component.ts
index 088034c7..abbe8c04 100644
--- a/src/app/components/direct-link/direct-link.component.ts
+++ b/src/app/components/direct-link/direct-link.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
-import{ Controller } from '../../models/controller';
+import { Controller } from '../../models/controller';
 import { ControllerDatabase } from '../../services/controller.database';
 import { ControllerService } from '../../services/controller.service';
 import { ToasterService } from '../../services/toaster.service';
diff --git a/src/app/components/drawings-listeners/drawing-added/drawing-added.component.ts b/src/app/components/drawings-listeners/drawing-added/drawing-added.component.ts
index fd0dfb33..795cbf8b 100644
--- a/src/app/components/drawings-listeners/drawing-added/drawing-added.component.ts
+++ b/src/app/components/drawings-listeners/drawing-added/drawing-added.component.ts
@@ -7,7 +7,7 @@ import { AddedDataEvent } from '../../../cartography/events/event-source';
 import { DefaultDrawingsFactory } from '../../../cartography/helpers/default-drawings-factory';
 import { Drawing } from '../../../cartography/models/drawing';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { DrawingService } from '../../../services/drawing.service';
 
 @Component({
diff --git a/src/app/components/drawings-listeners/drawing-dragged/drawing-dragged.component.ts b/src/app/components/drawings-listeners/drawing-dragged/drawing-dragged.component.ts
index 8954e944..eb01de4d 100644
--- a/src/app/components/drawings-listeners/drawing-dragged/drawing-dragged.component.ts
+++ b/src/app/components/drawings-listeners/drawing-dragged/drawing-dragged.component.ts
@@ -6,7 +6,7 @@ import { DraggedDataEvent } from '../../../cartography/events/event-source';
 import { Drawing } from '../../../cartography/models/drawing';
 import { MapDrawing } from '../../../cartography/models/map/map-drawing';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { DrawingService } from '../../../services/drawing.service';
 
 @Component({
diff --git a/src/app/components/drawings-listeners/drawing-resized/drawing-resized.component.ts b/src/app/components/drawings-listeners/drawing-resized/drawing-resized.component.ts
index 1bfabf80..670fe498 100644
--- a/src/app/components/drawings-listeners/drawing-resized/drawing-resized.component.ts
+++ b/src/app/components/drawings-listeners/drawing-resized/drawing-resized.component.ts
@@ -6,7 +6,7 @@ import { DrawingsEventSource } from '../../../cartography/events/drawings-event-
 import { ResizedDataEvent } from '../../../cartography/events/event-source';
 import { Drawing } from '../../../cartography/models/drawing';
 import { MapDrawing } from '../../../cartography/models/map/map-drawing';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { DrawingService } from '../../../services/drawing.service';
 
 @Component({
diff --git a/src/app/components/drawings-listeners/interface-label-dragged/interface-label-dragged.component.ts b/src/app/components/drawings-listeners/interface-label-dragged/interface-label-dragged.component.ts
index 0e82d866..b0d45986 100644
--- a/src/app/components/drawings-listeners/interface-label-dragged/interface-label-dragged.component.ts
+++ b/src/app/components/drawings-listeners/interface-label-dragged/interface-label-dragged.component.ts
@@ -5,7 +5,7 @@ import { DraggedDataEvent } from '../../../cartography/events/event-source';
 import { LinksEventSource } from '../../../cartography/events/links-event-source';
 import { MapLinkNode } from '../../../cartography/models/map/map-link-node';
 import { Link } from '../../../models/link';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { LinkService } from '../../../services/link.service';
 
 @Component({
diff --git a/src/app/components/drawings-listeners/link-created/link-created.component.ts b/src/app/components/drawings-listeners/link-created/link-created.component.ts
index a5c027c6..234ae14f 100644
--- a/src/app/components/drawings-listeners/link-created/link-created.component.ts
+++ b/src/app/components/drawings-listeners/link-created/link-created.component.ts
@@ -7,7 +7,7 @@ import { MapLinkCreated } from '../../../cartography/events/links';
 import { LinksEventSource } from '../../../cartography/events/links-event-source';
 import { Link } from '../../../models/link';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { LinkService } from '../../../services/link.service';
 import { ProjectService } from '../../../services/project.service';
 
diff --git a/src/app/components/drawings-listeners/node-dragged/node-dragged.component.ts b/src/app/components/drawings-listeners/node-dragged/node-dragged.component.ts
index f651e94c..2b833de0 100644
--- a/src/app/components/drawings-listeners/node-dragged/node-dragged.component.ts
+++ b/src/app/components/drawings-listeners/node-dragged/node-dragged.component.ts
@@ -6,7 +6,7 @@ import { NodesEventSource } from '../../../cartography/events/nodes-event-source
 import { MapNode } from '../../../cartography/models/map/map-node';
 import { Node } from '../../../cartography/models/node';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { NodeService } from '../../../services/node.service';
 
 @Component({
diff --git a/src/app/components/drawings-listeners/node-label-dragged/node-label-dragged.component.ts b/src/app/components/drawings-listeners/node-label-dragged/node-label-dragged.component.ts
index 4f878032..8e56920c 100644
--- a/src/app/components/drawings-listeners/node-label-dragged/node-label-dragged.component.ts
+++ b/src/app/components/drawings-listeners/node-label-dragged/node-label-dragged.component.ts
@@ -6,7 +6,7 @@ import { DraggedDataEvent } from '../../../cartography/events/event-source';
 import { NodesEventSource } from '../../../cartography/events/nodes-event-source';
 import { MapLabel } from '../../../cartography/models/map/map-label';
 import { Node } from '../../../cartography/models/node';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { NodeService } from '../../../services/node.service';
 
 @Component({
diff --git a/src/app/components/drawings-listeners/text-added/text-added.component.ts b/src/app/components/drawings-listeners/text-added/text-added.component.ts
index dfd05038..9b025cb8 100644
--- a/src/app/components/drawings-listeners/text-added/text-added.component.ts
+++ b/src/app/components/drawings-listeners/text-added/text-added.component.ts
@@ -9,7 +9,7 @@ import { Context } from '../../../cartography/models/context';
 import { Drawing } from '../../../cartography/models/drawing';
 import { TextElement } from '../../../cartography/models/drawings/text-element';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { DrawingService } from '../../../services/drawing.service';
 
 @Component({
diff --git a/src/app/components/drawings-listeners/text-edited/text-edited.component.ts b/src/app/components/drawings-listeners/text-edited/text-edited.component.ts
index 32a138e5..0a5f77f5 100644
--- a/src/app/components/drawings-listeners/text-edited/text-edited.component.ts
+++ b/src/app/components/drawings-listeners/text-edited/text-edited.component.ts
@@ -7,7 +7,7 @@ import { TextEditedDataEvent } from '../../../cartography/events/event-source';
 import { Drawing } from '../../../cartography/models/drawing';
 import { TextElement } from '../../../cartography/models/drawings/text-element';
 import { MapDrawing } from '../../../cartography/models/map/map-drawing';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { DrawingService } from '../../../services/drawing.service';
 
 @Component({
diff --git a/src/app/components/export-portable-project/export-portable-project.component.ts b/src/app/components/export-portable-project/export-portable-project.component.ts
index 90b3c06e..32ed612f 100644
--- a/src/app/components/export-portable-project/export-portable-project.component.ts
+++ b/src/app/components/export-portable-project/export-portable-project.component.ts
@@ -2,7 +2,7 @@ import { Component, Inject, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { Project } from '../../models/project';
-import{ Controller } from '../../models/controller';
+import { Controller } from '../../models/controller';
 import { ProjectService } from '../../services/project.service';
 
 @Component({
diff --git a/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.spec.ts b/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.spec.ts
index 0e319041..537499c6 100644
--- a/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.spec.ts
+++ b/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.spec.ts
@@ -8,7 +8,7 @@ import { ImageManagerService } from 'app/services/image-manager.service';
 import { ControllerService } from '../../../services/controller.service';
 import { MockedControllerService } from '../../../services/controller.service.spec';
 import { of } from 'rxjs';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 
 import { AddImageDialogComponent } from './add-image-dialog.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
diff --git a/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.ts b/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.ts
index 392e6063..754ea1dd 100644
--- a/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.ts
+++ b/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.ts
@@ -3,7 +3,7 @@ import { Component, Inject, OnInit } from '@angular/core';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { UploadServiceService } from 'app/common/uploading-processbar/upload-service.service';
 import { FileItem, FileUploader, ParsedResponseHeaders } from 'ng2-file-upload';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { ImageManagerService } from '../../../services/image-manager.service';
 import { ToasterService } from '../../../services/toaster.service';
 
diff --git a/src/app/components/image-manager/image-manager.component.spec.ts b/src/app/components/image-manager/image-manager.component.spec.ts
index 4d1d9e86..28e95a9a 100644
--- a/src/app/components/image-manager/image-manager.component.spec.ts
+++ b/src/app/components/image-manager/image-manager.component.spec.ts
@@ -9,7 +9,7 @@ import { ImageManagerService } from 'app/services/image-manager.service';
 import { ControllerService } from 'app/services/controller.service';
 import { MockedControllerService } from 'app/services/controller.service.spec';
 import { of } from 'rxjs';
-import{ Controller } from '../../models/controller';
+import { Controller } from '../../models/controller';
 
 import { ImageManagerComponent } from './image-manager.component';
 import { Image } from '../../models/images';
diff --git a/src/app/components/image-manager/image-manager.component.ts b/src/app/components/image-manager/image-manager.component.ts
index 7ccd3d31..94d9e1c7 100644
--- a/src/app/components/image-manager/image-manager.component.ts
+++ b/src/app/components/image-manager/image-manager.component.ts
@@ -4,7 +4,7 @@ import { ControllerService } from '../../services/controller.service';
 import { VersionService } from '../../services/version.service';
 import { ProgressService } from 'app/common/progress/progress.service';
 import { Image } from '../../models/images';
-import{ Controller } from '../../models/controller';
+import { Controller } from '../../models/controller';
 import { ImageManagerService } from "../../services/image-manager.service";
 import { DataSource, SelectionModel } from '@angular/cdk/collections';
 import { AddImageDialogComponent } from './add-image-dialog/add-image-dialog.component';
@@ -60,7 +60,7 @@ export class ImageManagerComponent implements OnInit {
       },
       (error) => {
         this.toasterService.error(error.error.message)
-      
+
       }
     );
   }
diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts
index efb62ece..7e707b30 100644
--- a/src/app/components/login/login.component.ts
+++ b/src/app/components/login/login.component.ts
@@ -2,7 +2,7 @@ import { Component, DoCheck, OnInit, ViewEncapsulation } from '@angular/core';
 import { UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { AuthResponse } from '../../models/authResponse';
-import{ Controller } from '../../models/controller';
+import { Controller } from '../../models/controller';
 import { Version } from '../../models/version';
 import { LoginService } from '../../services/login.service';
 import { ControllerDatabase } from '../../services/controller.database';
diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts
index f33ac462..181dac7a 100644
--- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts
+++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts
@@ -10,7 +10,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { CloudTemplate } from '../../../../../models/templates/cloud-template';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ComputeService } from '../../../../../services/compute.service';
diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts
index c909b54e..cf29c5c4 100644
--- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts
+++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts
@@ -3,7 +3,7 @@ import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators }
 import { ActivatedRoute, Router } from '@angular/router';
 import { v4 as uuid } from 'uuid';
 import { Compute } from '../../../../../models/compute';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { CloudTemplate } from '../../../../../models/templates/cloud-template';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ComputeService } from '../../../../../services/compute.service';
diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.html b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.html
index ce992fe5..a1f4593a 100644
--- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.html
+++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.html
@@ -1,7 +1,7 @@
 <div class="content" [ngClass]="{ shadowed: isSymbolSelectionOpened }">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">Cloud configuration</h1>
+      <h1 class="col">Cloud node template configuration</h1>
     </div>
     <div class="default-content" *ngIf="cloudNodeTemplate">
         <mat-accordion>
@@ -12,27 +12,27 @@
                     </mat-panel-title>
                 </mat-expansion-panel-header>
                 <mat-form-field class="form-field">
-                    <input 
-                        matInput type="text" 
-                        [(ngModel)]="cloudNodeTemplate.name" 
+                    <input
+                        matInput type="text"
+                        [(ngModel)]="cloudNodeTemplate.name"
                         placeholder="Template name">
                 </mat-form-field>
                 <mat-form-field class="form-field">
-                    <input 
-                        matInput type="text" 
-                        [(ngModel)]="cloudNodeTemplate.default_name_format" 
+                    <input
+                        matInput type="text"
+                        [(ngModel)]="cloudNodeTemplate.default_name_format"
                         placeholder="Default name format">
                 </mat-form-field>
                 <mat-form-field class="form-field">
-                    <input 
-                        matInput type="text" 
-                        [(ngModel)]="cloudNodeTemplate.symbol" 
+                    <input
+                        matInput type="text"
+                        [(ngModel)]="cloudNodeTemplate.symbol"
                         placeholder="Symbol">
                 </mat-form-field>
                 <button mat-button class="symbolSelectionButton" (click)="chooseSymbol()">Choose symbol</button><br/><br/>
                 <mat-form-field class="form-field">
-                    <mat-select 
-                        placeholder="Category" 
+                    <mat-select
+                        placeholder="Category"
                         [(ngModel)]="cloudNodeTemplate.category">
                         <mat-option *ngFor="let category of categories" [value]="category[1]">
                             {{category[0]}}
@@ -40,8 +40,8 @@
                     </mat-select>
                 </mat-form-field>
                 <mat-form-field class="select">
-                    <mat-select 
-                        placeholder="Console type" 
+                    <mat-select
+                        placeholder="Console type"
                         [(ngModel)]="cloudNodeTemplate.console_type">
                             <mat-option *ngFor="let type of consoleTypes" [value]="type">
                                 {{type}}
@@ -49,21 +49,21 @@
                     </mat-select>
                 </mat-form-field>
                 <mat-form-field class="form-field">
-                    <input 
-                        matInput type="text" 
-                        [(ngModel)]="cloudNodeTemplate.remote_console_host" 
+                    <input
+                        matInput type="text"
+                        [(ngModel)]="cloudNodeTemplate.remote_console_host"
                         placeholder="Console host">
                 </mat-form-field>
                 <mat-form-field class="form-field">
-                    <input 
-                        matInput type="text" 
-                        [(ngModel)]="cloudNodeTemplate.remote_console_port" 
+                    <input
+                        matInput type="text"
+                        [(ngModel)]="cloudNodeTemplate.remote_console_port"
                         placeholder="Console port">
                 </mat-form-field>
                 <mat-form-field class="form-field">
-                    <input 
-                        matInput type="text" 
-                        [(ngModel)]="cloudNodeTemplate.remote_console_http_path" 
+                    <input
+                        matInput type="text"
+                        [(ngModel)]="cloudNodeTemplate.remote_console_http_path"
                         placeholder="Console HTTP path">
                 </mat-form-field>
             </mat-expansion-panel>
@@ -77,16 +77,16 @@
                     <div class="form-field">{{port.name}}</div><br/><br/>
                 </div>
                 <mat-form-field class="select">
-                    <mat-select 
-                        placeholder="Ethernet interface" 
-                        [ngModelOptions]="{standalone: true}" 
+                    <mat-select
+                        placeholder="Ethernet interface"
+                        [ngModelOptions]="{standalone: true}"
                         [(ngModel)]="ethernetInterface">
                             <mat-option *ngFor="let type of ethernetInterfaces" [value]="type">
                                 {{type}}
                             </mat-option>
                     </mat-select>
                 </mat-form-field>
-                <button mat-button class="form-field" (click)="onAddEthernetInterface()">Add</button> 
+                <button mat-button class="form-field" (click)="onAddEthernetInterface()">Add</button>
             </mat-expansion-panel>
             <mat-expansion-panel>
                 <mat-expansion-panel-header>
@@ -98,12 +98,12 @@
                     <div class="form-field">{{port.name}}</div><br/><br/>
                 </div>
                 <mat-form-field class="form-field">
-                    <input 
-                        matInput type="text" 
-                        [(ngModel)]="tapInterface" 
+                    <input
+                        matInput type="text"
+                        [(ngModel)]="tapInterface"
                         placeholder="TAP interface">
                 </mat-form-field>
-                <button mat-button class="form-field" (click)="onAddTapInterface()">Add</button> 
+                <button mat-button class="form-field" (click)="onAddTapInterface()">Add</button>
             </mat-expansion-panel>
             <mat-expansion-panel>
                 <mat-expansion-panel-header>
@@ -116,12 +116,12 @@
                         <th mat-header-cell *matHeaderCellDef> Name </th>
                         <td mat-cell *matCellDef="let element"> {{element.name}} </td>
                     </ng-container>
-    
+
                     <ng-container matColumnDef="rport">
                         <th mat-header-cell *matHeaderCellDef> Local port </th>
                         <td mat-cell *matCellDef="let element"> {{element.rport}} </td>
                     </ng-container>
-    
+
                     <ng-container matColumnDef="rhost">
                         <th mat-header-cell *matHeaderCellDef> Type </th>
                         <td mat-cell *matCellDef="let element"> {{element.rhost}} </td>
@@ -131,33 +131,33 @@
                         <th mat-header-cell *matHeaderCellDef> Remote port </th>
                         <td mat-cell *matCellDef="let element"> {{element.lport}} </td>
                     </ng-container>
-                    
+
                     <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
                     <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
                 </table>
                 <br *ngIf="dataSourceUdp.length"/>
                 <mat-form-field class="form-field">
-                    <input 
-                        matInput type="text" 
-                        [(ngModel)]="newPort.name" 
+                    <input
+                        matInput type="text"
+                        [(ngModel)]="newPort.name"
                         placeholder="Name">
                 </mat-form-field>
                 <mat-form-field class="form-field">
-                    <input 
-                        matInput type="number" 
-                        [(ngModel)]="newPort.lport" 
+                    <input
+                        matInput type="number"
+                        [(ngModel)]="newPort.lport"
                         placeholder="Local port">
                 </mat-form-field>
                 <mat-form-field class="form-field">
-                    <input 
-                        matInput type="text" 
-                        [(ngModel)]="newPort.rhost" 
+                    <input
+                        matInput type="text"
+                        [(ngModel)]="newPort.rhost"
                         placeholder="Remote host">
                 </mat-form-field>
                 <mat-form-field class="form-field">
-                    <input 
-                        matInput type="number" 
-                        [(ngModel)]="newPort.rport" 
+                    <input
+                        matInput type="number"
+                        [(ngModel)]="newPort.rport"
                         placeholder="Remote port">
                 </mat-form-field>
                 <button mat-button class="form-field" (click)="onAddUdpInterface()">Add</button>
diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts
index d5e2a062..d9e6620e 100644
--- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts
+++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts
@@ -11,7 +11,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { CloudTemplate } from '../../../../../models/templates/cloud-template';
 import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts
index 72fd1529..6b424236 100644
--- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts
+++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { PortsMappingEntity } from '../../../../../models/ethernetHub/ports-mapping-enity';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { CloudTemplate } from '../../../../../models/templates/cloud-template';
 import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts
index bbc60d08..5c616a85 100644
--- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts
+++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts
@@ -9,7 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { CloudTemplate } from '../../../../../models/templates/cloud-template';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ControllerService } from '../../../../../services/controller.service';
diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts
index 209142c4..209ee2b3 100644
--- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts
+++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { CloudTemplate } from '../../../../../models/templates/cloud-template';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ControllerService } from '../../../../../services/controller.service';
diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts
index bfb77068..c556042c 100644
--- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts
+++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts
@@ -10,7 +10,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hub-template';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ComputeService } from '../../../../../services/compute.service';
diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts
index c2992dd9..183a5cad 100644
--- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts
+++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts
@@ -3,7 +3,7 @@ import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators }
 import { ActivatedRoute, Router } from '@angular/router';
 import { v4 as uuid } from 'uuid';
 import { Compute } from '../../../../../models/compute';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hub-template';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ComputeService } from '../../../../../services/compute.service';
diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.html b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.html
index b4e42950..e0026219 100644
--- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.html
+++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.html
@@ -13,7 +13,7 @@
       </button>
       </div>
       <div class="col-md-11">
-        <h1 class="col">Ethernet hub settings</h1>
+        <h1 class="col">Ethernet hub template configuration</h1>
       </div>
     </div>
   </div>
diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts
index 083bcbd6..d917ea6b 100644
--- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts
+++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts
@@ -11,7 +11,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hub-template';
 import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts
index 84f823b0..96425189 100644
--- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts
+++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hub-template';
 import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts
index 5fe651e3..1d0664fd 100644
--- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts
+++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts
@@ -9,7 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hub-template';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ControllerService } from '../../../../../services/controller.service';
diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts
index fd799698..bd9c912d 100644
--- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts
+++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { EthernetHubTemplate } from '../../../../../models/templates/ethernet-hub-template';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ControllerService } from '../../../../../services/controller.service';
diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts
index 99e18d90..07ba23bf 100644
--- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts
+++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts
@@ -10,7 +10,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet-switch-template';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ComputeService } from '../../../../../services/compute.service';
diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts
index a312786d..fb4172e3 100644
--- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts
+++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts
@@ -3,7 +3,7 @@ import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators }
 import { ActivatedRoute, Router } from '@angular/router';
 import { v4 as uuid } from 'uuid';
 import { Compute } from '../../../../../models/compute';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet-switch-template';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ComputeService } from '../../../../../services/compute.service';
diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.html b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.html
index dcd41345..fa3b7ff0 100644
--- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.html
+++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.html
@@ -7,7 +7,7 @@
         </button>
       </div>
       <div class="col-md-11">
-        <h1 class="col">Ethernet switch configuration</h1>
+        <h1 class="col">Ethernet switch template configuration</h1>
       </div>
     </div>
   </div>
diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts
index 4a006ada..5c13b02e 100644
--- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts
+++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts
@@ -11,7 +11,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet-switch-template';
 import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts
index d5d3893b..44ab057a 100644
--- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts
+++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet-switch-template';
 import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts
index b4b67078..c94175ef 100644
--- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts
+++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts
@@ -9,7 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet-switch-template';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ControllerService } from '../../../../../services/controller.service';
diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts
index 08cf3d76..f8a1a647 100644
--- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts
+++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { EthernetSwitchTemplate } from '../../../../../models/templates/ethernet-switch-template';
 import { BuiltInTemplatesService } from '../../../../../services/built-in-templates.service';
 import { ControllerService } from '../../../../../services/controller.service';
diff --git a/src/app/components/preferences/common/delete-template-component/delete-template.component.ts b/src/app/components/preferences/common/delete-template-component/delete-template.component.ts
index ae222c57..6973c8d2 100644
--- a/src/app/components/preferences/common/delete-template-component/delete-template.component.ts
+++ b/src/app/components/preferences/common/delete-template-component/delete-template.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { TemplateService } from '../../../../services/template.service';
 import { ToasterService } from '../../../../services/toaster.service';
 import { DeleteConfirmationDialogComponent } from '../delete-confirmation-dialog/delete-confirmation-dialog.component';
diff --git a/src/app/components/preferences/common/symbols-menu/symbols-menu.component.ts b/src/app/components/preferences/common/symbols-menu/symbols-menu.component.ts
index 1db2a26a..82ea8659 100644
--- a/src/app/components/preferences/common/symbols-menu/symbols-menu.component.ts
+++ b/src/app/components/preferences/common/symbols-menu/symbols-menu.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 
 @Component({
   selector: 'app-symbols-menu',
diff --git a/src/app/components/preferences/common/symbols/symbols.component.ts b/src/app/components/preferences/common/symbols/symbols.component.ts
index 0e82e324..df487406 100644
--- a/src/app/components/preferences/common/symbols/symbols.component.ts
+++ b/src/app/components/preferences/common/symbols/symbols.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { environment } from 'environments/environment';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { Symbol } from '../../../../models/symbol';
 import { SymbolService } from '../../../../services/symbol.service';
 
@@ -73,7 +73,7 @@ export class SymbolsComponent implements OnInit {
   }
 
   private createSvgFileForImage(image: string | ArrayBuffer, imageToUpload: HTMLImageElement) {
-    return `<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" height=\"${imageToUpload.height}\" 
+    return `<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" height=\"${imageToUpload.height}\"
                 width=\"${imageToUpload.width}\">\n<image height=\"${imageToUpload.height}\" width=\"${imageToUpload.width}\" xlink:href=\"${image}\"/>\n</svg>`;
   }
 
diff --git a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts
index 2273b556..0d814907 100644
--- a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts
+++ b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts
@@ -18,7 +18,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { DockerTemplate } from '../../../../models/templates/docker-template';
 import { DockerConfigurationService } from '../../../../services/docker-configuration.service';
 import { DockerService } from '../../../../services/docker.service';
diff --git a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts
index 507d3172..65ad0432 100644
--- a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts
+++ b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts
@@ -4,7 +4,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { v4 as uuid } from 'uuid';
 import { Compute } from '../../../../models/compute';
 import { DockerImage } from '../../../../models/docker/docker-image';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { DockerTemplate } from '../../../../models/templates/docker-template';
 import { ComputeService } from '../../../../services/compute.service';
 import { DockerConfigurationService } from '../../../../services/docker-configuration.service';
diff --git a/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts b/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts
index 723e47fe..e526e694 100644
--- a/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts
+++ b/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { v4 as uuid } from 'uuid';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { DockerTemplate } from '../../../../models/templates/docker-template';
 import { DockerService } from '../../../../services/docker.service';
 import { ControllerService } from '../../../../services/controller.service';
diff --git a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html
index 300800eb..dcd54a31 100644
--- a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html
+++ b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html
@@ -7,7 +7,7 @@
         </button>
       </div>
       <div class="col col-md-11">
-        <h1 class="col">Docker image configuration</h1>
+        <h1 class="col">Docker container template configuration</h1>
       </div>
     </div>
   </div>
diff --git a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts
index 8d134acd..0dd43364 100644
--- a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts
+++ b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts
@@ -10,7 +10,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { DockerTemplate } from '../../../../models/templates/docker-template';
 import { DockerConfigurationService } from '../../../../services/docker-configuration.service';
 import { DockerService } from '../../../../services/docker.service';
diff --git a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts
index 9e101a62..ca2ec96a 100644
--- a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts
+++ b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { CustomAdapter } from '../../../../models/qemu/qemu-custom-adapter';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { DockerTemplate } from '../../../../models/templates/docker-template';
 import { DockerConfigurationService } from '../../../../services/docker-configuration.service';
 import { DockerService } from '../../../../services/docker.service';
diff --git a/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts b/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts
index 962f79ce..a3a9d06e 100644
--- a/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts
+++ b/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts
@@ -9,7 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { DockerTemplate } from '../../../../models/templates/docker-template';
 import { DockerService } from '../../../../services/docker.service';
 import { ControllerService } from '../../../../services/controller.service';
diff --git a/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts b/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts
index dd176d41..86739dec 100644
--- a/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts
+++ b/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { DockerTemplate } from '../../../../models/templates/docker-template';
 import { DockerService } from '../../../../services/docker.service';
 import { ControllerService } from '../../../../services/controller.service';
diff --git a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts
index b329a8ff..83b21228 100644
--- a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts
+++ b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts
@@ -16,7 +16,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { IosTemplate } from '../../../../models/templates/ios-template';
 import { IosConfigurationService } from '../../../../services/ios-configuration.service';
 import { IosService } from '../../../../services/ios.service';
diff --git a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts
index 54713c33..c43e91eb 100644
--- a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts
+++ b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts
@@ -10,7 +10,7 @@ import { Subscription } from 'rxjs';
 import { v4 as uuid } from 'uuid';
 import { Compute } from '../../../../models/compute';
 import { IosImage } from '../../../../models/images/ios-image';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { IosTemplate } from '../../../../models/templates/ios-template';
 import { ComputeService } from '../../../../services/compute.service';
 import { IosConfigurationService } from '../../../../services/ios-configuration.service';
diff --git a/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts b/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts
index 5a8717e7..41c8f526 100644
--- a/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts
+++ b/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { v4 as uuid } from 'uuid';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { IosTemplate } from '../../../../models/templates/ios-template';
 import { IosService } from '../../../../services/ios.service';
 import { ControllerService } from '../../../../services/controller.service';
diff --git a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts
index 9a76977c..31597bd7 100644
--- a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts
+++ b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { ControllerSettingsService } from '../../../../services/controller-settings.service';
 import { ControllerService } from '../../../../services/controller.service';
 
diff --git a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.html b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.html
index ee1401c2..67a9a7a5 100644
--- a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.html
+++ b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.html
@@ -1,7 +1,7 @@
 <div class="content" [ngClass]="{ shadowed: isSymbolSelectionOpened }">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">Dynamips IOS Router configuration</h1>
+      <h1 class="col">IOS router template configuration</h1>
     </div>
   </div>
   <div class="default-content" *ngIf="iosTemplate">
diff --git a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts
index 883efa13..9e6e4743 100644
--- a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts
+++ b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts
@@ -10,7 +10,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { IosTemplate } from '../../../../models/templates/ios-template';
 import { IosConfigurationService } from '../../../../services/ios-configuration.service';
 import { IosService } from '../../../../services/ios.service';
diff --git a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts
index 8dfae1aa..0c89d5b6 100644
--- a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts
+++ b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { IosTemplate } from '../../../../models/templates/ios-template';
 import { IosConfigurationService } from '../../../../services/ios-configuration.service';
 import { IosService } from '../../../../services/ios.service';
diff --git a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts
index df49bc65..49ef83cb 100644
--- a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts
+++ b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts
@@ -9,7 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { IosTemplate } from '../../../../models/templates/ios-template';
 import { IosService } from '../../../../services/ios.service';
 import { ControllerService } from '../../../../services/controller.service';
diff --git a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts
index 02958527..d3b022c9 100644
--- a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts
+++ b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { IosTemplate } from '../../../../models/templates/ios-template';
 import { VpcsTemplate } from '../../../../models/templates/vpcs-template';
 import { IosService } from '../../../../services/ios.service';
diff --git a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts
index 56c59af0..e735a1f6 100644
--- a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts
+++ b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts
@@ -16,7 +16,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { IouTemplate } from '../../../../models/templates/iou-template';
 import { IouConfigurationService } from '../../../../services/iou-configuration.service';
 import { IouService } from '../../../../services/iou.service';
diff --git a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts
index 5d167976..9a798eb8 100644
--- a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts
+++ b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts
@@ -9,7 +9,7 @@ import { Subscription } from 'rxjs';
 import { v4 as uuid } from 'uuid';
 import { Compute } from '../../../../models/compute';
 import { IouImage } from '../../../../models/iou/iou-image';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { IouTemplate } from '../../../../models/templates/iou-template';
 import { ComputeService } from '../../../../services/compute.service';
 import { IouService } from '../../../../services/iou.service';
diff --git a/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts b/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts
index c4b67197..cbdff8b5 100644
--- a/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts
+++ b/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { v4 as uuid } from 'uuid';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { IouTemplate } from '../../../../models/templates/iou-template';
 import { IouService } from '../../../../services/iou.service';
 import { ControllerService } from '../../../../services/controller.service';
diff --git a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.html b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.html
index b159104c..96707687 100644
--- a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.html
+++ b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.html
@@ -8,7 +8,7 @@
           </button>
         </div>
         <div class="col col-md-11">
-          <h1 class="col">IOU device configuration</h1>
+          <h1 class="col">IOU device template configuration</h1>
         </div>
       </div>
     </div>
diff --git a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts
index 04945f98..8f864a31 100644
--- a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts
+++ b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts
@@ -10,7 +10,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { IouTemplate } from '../../../../models/templates/iou-template';
 import { IouConfigurationService } from '../../../../services/iou-configuration.service';
 import { IouService } from '../../../../services/iou.service';
diff --git a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts
index 5d104ec2..03b8a79e 100644
--- a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts
+++ b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { IouTemplate } from '../../../../models/templates/iou-template';
 import { IouConfigurationService } from '../../../../services/iou-configuration.service';
 import { IouService } from '../../../../services/iou.service';
diff --git a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts
index 7b931f93..1233f1e8 100644
--- a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts
+++ b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts
@@ -9,7 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { IouTemplate } from '../../../../models/templates/iou-template';
 import { IouService } from '../../../../services/iou.service';
 import { ControllerService } from '../../../../services/controller.service';
diff --git a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts
index eed63fc8..b193a4e6 100644
--- a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts
+++ b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { IouTemplate } from '../../../../models/templates/iou-template';
 import { IouService } from '../../../../services/iou.service';
 import { ControllerService } from '../../../../services/controller.service';
diff --git a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts
index 2543f5c9..2b902e4a 100644
--- a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts
+++ b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts
@@ -15,7 +15,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute, Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { QemuTemplate } from '../../../../models/templates/qemu-template';
 import { QemuConfigurationService } from '../../../../services/qemu-configuration.service';
 import { QemuService } from '../../../../services/qemu.service';
diff --git a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts
index cfdc1718..08daeb16 100644
--- a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts
+++ b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts
@@ -9,7 +9,7 @@ import { v4 as uuid } from 'uuid';
 import { Compute } from '../../../../models/compute';
 import { QemuBinary } from '../../../../models/qemu/qemu-binary';
 import { QemuImage } from '../../../../models/qemu/qemu-image';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { QemuTemplate } from '../../../../models/templates/qemu-template';
 import { ComputeService } from '../../../../services/compute.service';
 import { QemuConfigurationService } from '../../../../services/qemu-configuration.service';
diff --git a/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts b/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts
index 3a5883cd..1d4cee3f 100644
--- a/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts
+++ b/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts
@@ -3,7 +3,7 @@ import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators }
 import { ActivatedRoute, Router } from '@angular/router';
 import { v4 as uuid } from 'uuid';
 import { QemuBinary } from '../../../../models/qemu/qemu-binary';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { QemuTemplate } from '../../../../models/templates/qemu-template';
 import { QemuService } from '../../../../services/qemu.service';
 import { ControllerService } from '../../../../services/controller.service';
diff --git a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts
index fa375701..d7fd2bfa 100644
--- a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts
+++ b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { QemuSettings } from '../../../../models/settings/qemu-settings';
 import { ControllerSettingsService } from '../../../../services/controller-settings.service';
 import { ControllerService } from '../../../../services/controller.service';
diff --git a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.html b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.html
index 674f0fbd..137b8c89 100644
--- a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.html
+++ b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.html
@@ -7,7 +7,7 @@
         </button>
       </div>
       <div class="col col-md-11">
-        <h1 class="col">QEMU VM configuration</h1>
+        <h1 class="col">QEMU VM template configuration</h1>
       </div>
     </div>
   </div>
diff --git a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts
index 424ab9f9..19c906b5 100644
--- a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts
+++ b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts
@@ -11,7 +11,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { QemuTemplate } from '../../../../models/templates/qemu-template';
 import { QemuConfigurationService } from '../../../../services/qemu-configuration.service';
 import { QemuService } from '../../../../services/qemu.service';
diff --git a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts
index ff0c939c..39b4050d 100644
--- a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts
+++ b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts
@@ -3,7 +3,7 @@ import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators }
 import { ActivatedRoute, Router } from '@angular/router';
 import { QemuBinary } from '../../../../models/qemu/qemu-binary';
 import { CustomAdapter } from '../../../../models/qemu/qemu-custom-adapter';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { QemuTemplate } from '../../../../models/templates/qemu-template';
 import { QemuConfigurationService } from '../../../../services/qemu-configuration.service';
 import { QemuService } from '../../../../services/qemu.service';
diff --git a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts
index 5a2d16c9..5e021535 100644
--- a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts
+++ b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts
@@ -9,7 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { QemuTemplate } from '../../../../models/templates/qemu-template';
 import { QemuService } from '../../../../services/qemu.service';
 import { ControllerService } from '../../../../services/controller.service';
diff --git a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts
index 5ae66b42..c1d7c9ac 100644
--- a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts
+++ b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { QemuTemplate } from '../../../../models/templates/qemu-template';
 import { QemuService } from '../../../../services/qemu.service';
 import { ControllerService } from '../../../../services/controller.service';
diff --git a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts
index 41646446..701042c0 100644
--- a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts
+++ b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts
@@ -10,7 +10,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-template';
 import { ControllerService } from '../../../../services/controller.service';
 import { MockedControllerService } from '../../../../services/controller.service.spec';
diff --git a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts
index 6d83f906..93ca59d6 100644
--- a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts
+++ b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { v4 as uuid } from 'uuid';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-template';
 import { VirtualBoxVm } from '../../../../models/virtualBox/virtual-box-vm';
 import { ControllerService } from '../../../../services/controller.service';
diff --git a/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts b/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts
index f18119d6..5550fae8 100644
--- a/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts
+++ b/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { ControllerService } from '../../../../services/controller.service';
 
 @Component({
diff --git a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.html b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.html
index 4c387302..f67b8f25 100644
--- a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.html
+++ b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.html
@@ -7,7 +7,7 @@
         </button>
       </div>
       <div class="col col-md-11">
-        <h1 class="col">VirtualBox VM configuration</h1>
+        <h1 class="col">VirtualBox VM template configuration</h1>
       </div>
     </div>
   </div>
diff --git a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts
index 8265a6f0..656951a4 100644
--- a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts
+++ b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts
@@ -11,7 +11,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-template';
 import { ControllerService } from '../../../../services/controller.service';
 import { MockedControllerService } from '../../../../services/controller.service.spec';
diff --git a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts
index a91f60bc..2086eb7b 100644
--- a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts
+++ b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { CustomAdapter } from '../../../../models/qemu/qemu-custom-adapter';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-template';
 import { ControllerService } from '../../../../services/controller.service';
 import { ToasterService } from '../../../../services/toaster.service';
diff --git a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts
index 96b38843..b587cf99 100644
--- a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts
+++ b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts
@@ -9,7 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-template';
 import { ControllerService } from '../../../../services/controller.service';
 import { MockedControllerService } from '../../../../services/controller.service.spec';
diff --git a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts
index ee5d1471..370daefd 100644
--- a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts
+++ b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { VirtualBoxTemplate } from '../../../../models/templates/virtualbox-template';
 import { VpcsTemplate } from '../../../../models/templates/vpcs-template';
 import { ControllerService } from '../../../../services/controller.service';
diff --git a/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts b/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts
index d502b004..ae3c5993 100644
--- a/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts
+++ b/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { v4 as uuid } from 'uuid';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { VmwareTemplate } from '../../../../models/templates/vmware-template';
 import { VmwareVm } from '../../../../models/vmware/vmware-vm';
 import { ControllerService } from '../../../../services/controller.service';
diff --git a/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts b/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts
index 8c5f3d4c..a86b739d 100644
--- a/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts
+++ b/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts
@@ -10,7 +10,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { VmwareTemplate } from '../../../../models/templates/vmware-template';
 import { VmwareVm } from '../../../../models/vmware/vmware-vm';
 import { ControllerService } from '../../../../services/controller.service';
diff --git a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts
index f424949d..ba2c9398 100644
--- a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts
+++ b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { ControllerService } from '../../../../services/controller.service';
 
 @Component({
diff --git a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.html b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.html
index d22f31cd..13e33c71 100644
--- a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.html
+++ b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.html
@@ -7,7 +7,7 @@
         </button>
       </div>
       <div class="col col-md-11">
-      <h1 class="col">VMware VM configuration</h1>
+      <h1 class="col">VMware VM template configuration</h1>
       </div>
     </div>
   </div>
diff --git a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts
index 9cbf0c1b..e2cff759 100644
--- a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts
+++ b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts
@@ -11,7 +11,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { VmwareTemplate } from '../../../../models/templates/vmware-template';
 import { ControllerService } from '../../../../services/controller.service';
 import { MockedControllerService } from '../../../../services/controller.service.spec';
diff --git a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts
index a2ea0f5d..1ef9e066 100644
--- a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts
+++ b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { CustomAdapter } from '../../../../models/qemu/qemu-custom-adapter';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { VmwareTemplate } from '../../../../models/templates/vmware-template';
 import { ControllerService } from '../../../../services/controller.service';
 import { ToasterService } from '../../../../services/toaster.service';
diff --git a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts
index 3ba6f731..a92736bf 100644
--- a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts
+++ b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts
@@ -9,7 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { VmwareTemplate } from '../../../../models/templates/vmware-template';
 import { ControllerService } from '../../../../services/controller.service';
 import { MockedControllerService } from '../../../../services/controller.service.spec';
diff --git a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts
index becd6d17..dead974f 100644
--- a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts
+++ b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { VmwareTemplate } from '../../../../models/templates/vmware-template';
 import { ControllerService } from '../../../../services/controller.service';
 import { VmwareService } from '../../../../services/vmware.service';
diff --git a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts
index 40af7b8d..02992704 100644
--- a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts
+++ b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts
@@ -10,7 +10,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { VpcsTemplate } from '../../../../models/templates/vpcs-template';
 import { ComputeService } from '../../../../services/compute.service';
 import { ControllerService } from '../../../../services/controller.service';
diff --git a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts
index 7cd45e38..0b8a4136 100644
--- a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts
+++ b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts
@@ -3,7 +3,7 @@ import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators }
 import { ActivatedRoute, Router } from '@angular/router';
 import { v4 as uuid } from 'uuid';
 import { Compute } from '../../../../models/compute';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { VpcsTemplate } from '../../../../models/templates/vpcs-template';
 import { ComputeService } from '../../../../services/compute.service';
 import { ControllerService } from '../../../../services/controller.service';
diff --git a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts
index 771f4861..bfa826f2 100644
--- a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts
+++ b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { ControllerService } from '../../../../services/controller.service';
 
 @Component({
diff --git a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.html b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.html
index ae176604..9791697d 100644
--- a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.html
+++ b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.html
@@ -13,7 +13,7 @@
         </button>
       </div>
       <div class="col col-md-11">
-        <h1 class="col">VPCS device configuration</h1>
+        <h1 class="col">VPCS node template configuration</h1>
       </div>
     </div>
   </div>
diff --git a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts
index ff412382..ec359000 100644
--- a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts
+++ b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts
@@ -10,7 +10,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { VpcsTemplate } from '../../../../models/templates/vpcs-template';
 import { ControllerService } from '../../../../services/controller.service';
 import { MockedControllerService } from '../../../../services/controller.service.spec';
diff --git a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts
index 80518e3c..388d0dd3 100644
--- a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts
+++ b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { VpcsTemplate } from '../../../../models/templates/vpcs-template';
 import { ControllerService } from '../../../../services/controller.service';
 import { ToasterService } from '../../../../services/toaster.service';
diff --git a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts
index b82a7f39..a719d053 100644
--- a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts
+++ b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts
@@ -9,7 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { VpcsTemplate } from '../../../../models/templates/vpcs-template';
 import { ControllerService } from '../../../../services/controller.service';
 import { MockedControllerService } from '../../../../services/controller.service.spec';
diff --git a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts
index 38c95b9d..5e105d8f 100644
--- a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts
+++ b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { VpcsTemplate } from '../../../../models/templates/vpcs-template';
 import { ControllerService } from '../../../../services/controller.service';
 import { VpcsService } from '../../../../services/vpcs.service';
diff --git a/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts b/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts
index 24041704..f5b3e6e3 100644
--- a/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts
+++ b/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { MatDialogRef } from '@angular/material/dialog';
 import { Node } from '../../../cartography/models/node';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { NodeService } from '../../../services/node.service';
 import { ToasterService } from '../../../services/toaster.service';
 
diff --git a/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts b/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts
index 5778932b..18bf854d 100644
--- a/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts
+++ b/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { MatDialogRef } from '@angular/material/dialog';
 import { Node } from '../../../cartography/models/node';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { NodeService } from '../../../services/node.service';
 
 @Component({
diff --git a/src/app/components/project-map/console-wrapper/console-wrapper.component.ts b/src/app/components/project-map/console-wrapper/console-wrapper.component.ts
index 4fdbee70..b69a6e6a 100644
--- a/src/app/components/project-map/console-wrapper/console-wrapper.component.ts
+++ b/src/app/components/project-map/console-wrapper/console-wrapper.component.ts
@@ -3,7 +3,7 @@ import { UntypedFormControl } from '@angular/forms';
 import { ResizeEvent } from 'angular-resizable-element';
 import { Node } from '../../../cartography/models/node';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { MapSettingsService } from '../../../services/mapsettings.service';
 import { NodeConsoleService } from '../../../services/nodeConsole.service';
 import { ThemeService } from '../../../services/theme.service';
diff --git a/src/app/components/project-map/context-console-menu/context-console-menu.component.spec.ts b/src/app/components/project-map/context-console-menu/context-console-menu.component.spec.ts
index ac9c4e66..9fe993e7 100644
--- a/src/app/components/project-map/context-console-menu/context-console-menu.component.spec.ts
+++ b/src/app/components/project-map/context-console-menu/context-console-menu.component.spec.ts
@@ -6,7 +6,7 @@ import { BrowserModule } from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { ElectronService } from 'ngx-electron';
 import { Node } from '../../../cartography/models/node';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { MapSettingsService } from '../../../services/mapsettings.service';
 import { NodeConsoleService } from '../../../services/nodeConsole.service';
 import { ProjectService } from '../../../services/project.service';
diff --git a/src/app/components/project-map/context-console-menu/context-console-menu.component.ts b/src/app/components/project-map/context-console-menu/context-console-menu.component.ts
index 7ebd3ae8..bb4c56ef 100644
--- a/src/app/components/project-map/context-console-menu/context-console-menu.component.ts
+++ b/src/app/components/project-map/context-console-menu/context-console-menu.component.ts
@@ -15,7 +15,7 @@ import { Router } from '@angular/router';
 import { ElectronService } from 'ngx-electron';
 import { Node } from '../../../cartography/models/node';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { MapSettingsService } from '../../../services/mapsettings.service';
 import { NodeConsoleService } from '../../../services/nodeConsole.service';
 import { ToasterService } from '../../../services/toaster.service';
diff --git a/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.ts b/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.ts
index 3970d900..a2a91c90 100644
--- a/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.ts
+++ b/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { NodesDataSource } from '../../../../../cartography/datasources/nodes-datasource';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.ts b/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.ts
index 1e8acebe..feef318a 100644
--- a/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.ts
+++ b/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { NodesDataSource } from '../../../../../cartography/datasources/nodes-datasource';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.ts b/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.ts
index 9b0ade8e..b1577634 100644
--- a/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.ts
@@ -3,7 +3,7 @@ import { DrawingsDataSource } from '../../../../../cartography/datasources/drawi
 import { NodesDataSource } from '../../../../../cartography/datasources/nodes-datasource';
 import { Drawing } from '../../../../../cartography/models/drawing';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { DrawingService } from '../../../../../services/drawing.service';
 import { NodeService } from '../../../../../services/node.service';
 
diff --git a/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts b/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts
index b39db155..125c8c9c 100644
--- a/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { ChangeHostnameDialogComponent } from '../../../change-hostname-dialog/change-hostname-dialog.component';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts b/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts
index b354f71e..34afab8b 100644
--- a/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { ChangeSymbolDialogComponent } from '../../../change-symbol-dialog/change-symbol-dialog.component';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts b/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts
index 7b34a332..027a96a8 100644
--- a/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { ConfiguratorDialogAtmSwitchComponent } from '../../../node-editors/configurator/atm_switch/configurator-atm-switch.component';
 import { ConfiguratorDialogCloudComponent } from '../../../node-editors/configurator/cloud/configurator-cloud.component';
 import { ConfiguratorDialogDockerComponent } from '../../../node-editors/configurator/docker/configurator-docker.component';
diff --git a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts
index fa6505b5..337b10a1 100644
--- a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts
+++ b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIconModule } from '@angular/material/icon';
 import { ElectronService } from 'ngx-electron';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 import { ControllerService } from '../../../../../services/controller.service';
 import { MockedControllerService } from '../../../../../services/controller.service.spec';
diff --git a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.ts b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.ts
index e601b9b5..96b95162 100644
--- a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { ElectronService } from 'ngx-electron';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 import { ControllerService } from '../../../../../services/controller.service';
 import { SettingsService } from '../../../../../services/settings.service';
diff --git a/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.ts b/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.ts
index af9ace23..dfd55a59 100644
--- a/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.ts
@@ -7,7 +7,7 @@ import { NodesDataSource } from '../../../../../cartography/datasources/nodes-da
 import { Drawing } from '../../../../../cartography/models/drawing';
 import { Node } from '../../../../../cartography/models/node';
 import { Link } from '../../../../../models/link';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { DrawingService } from '../../../../../services/drawing.service';
 import { LinkService } from '../../../../../services/link.service';
 import { NodeService } from '../../../../../services/node.service';
diff --git a/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.ts b/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.ts
index acf9f2e8..917845d9 100644
--- a/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.ts
@@ -4,7 +4,7 @@ import { NodesDataSource } from '../../../../../cartography/datasources/nodes-da
 import { Drawing } from '../../../../../cartography/models/drawing';
 import { Node } from '../../../../../cartography/models/node';
 import { Project } from '../../../../../models/project';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { DrawingService } from '../../../../../services/drawing.service';
 import { NodeService } from '../../../../../services/node.service';
 import { ToasterService } from '../../../../../services/toaster.service';
diff --git a/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts
index 2f2686e7..a46a6f98 100644
--- a/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts
@@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Node } from '../../../../../cartography/models/node';
 import { Project } from '../../../../../models/project';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { ConfigEditorDialogComponent } from '../../../node-editors/config-editor/config-editor.component';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/edit-link-style-action/edit-link-style-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-link-style-action/edit-link-style-action.component.ts
index 66a0f2fc..7ad43365 100644
--- a/src/app/components/project-map/context-menu/actions/edit-link-style-action/edit-link-style-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/edit-link-style-action/edit-link-style-action.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnChanges } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Link } from '../../../../../models/link';
 import { Project } from '../../../../../models/project';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { LinkStyleEditorDialogComponent } from '../../../drawings-editors/link-style-editor/link-style-editor.component';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts
index ed57c983..8f90b180 100644
--- a/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts
@@ -3,7 +3,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { Drawing } from '../../../../../cartography/models/drawing';
 import { ImageElement } from '../../../../../cartography/models/drawings/image-element';
 import { Project } from '../../../../../models/project';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { StyleEditorDialogComponent } from '../../../drawings-editors/style-editor/style-editor.component';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts
index 2f738947..72f5bc18 100644
--- a/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts
@@ -6,7 +6,7 @@ import { Node } from '../../../../../cartography/models/node';
 import { Link } from '../../../../../models/link';
 import { LinkNode } from '../../../../../models/link-node';
 import { Project } from '../../../../../models/project';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { TextEditorDialogComponent } from '../../../drawings-editors/text-editor/text-editor.component';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts b/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts
index 2d506ba4..28dfc208 100644
--- a/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 import { ConfigDialogComponent } from '../../dialogs/config-dialog/config-dialog.component';
 
diff --git a/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts b/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts
index d09da927..3d0bed8a 100644
--- a/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { NodeConsoleService } from '../../../../../services/nodeConsole.service';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 
 @Component({
   selector: 'app-http-console-new-tab-action',
diff --git a/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.ts b/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.ts
index e29d63a9..2c208bd6 100644
--- a/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeConsoleService } from '../../../../../services/nodeConsole.service';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts b/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts
index fb02fe16..9e6392da 100644
--- a/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts
@@ -1,7 +1,7 @@
 import { Component, ElementRef, Input, ViewChild } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 import { ToasterService } from '../../../../../services/toaster.service';
 import { ConfigDialogComponent } from '../../dialogs/config-dialog/config-dialog.component';
diff --git a/src/app/components/project-map/context-menu/actions/isolate-node-action/isolate-node-action.component.ts b/src/app/components/project-map/context-menu/actions/isolate-node-action/isolate-node-action.component.ts
index a4133000..731eafc0 100644
--- a/src/app/components/project-map/context-menu/actions/isolate-node-action/isolate-node-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/isolate-node-action/isolate-node-action.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 import { ToasterService } from '../../../../../services/toaster.service';
 
diff --git a/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts b/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts
index ed63ec20..9be1d770 100644
--- a/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts
@@ -3,7 +3,7 @@ import { DrawingsDataSource } from '../../../../../cartography/datasources/drawi
 import { NodesDataSource } from '../../../../../cartography/datasources/nodes-datasource';
 import { Drawing } from '../../../../../cartography/models/drawing';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { DrawingService } from '../../../../../services/drawing.service';
 import { NodeService } from '../../../../../services/node.service';
 
diff --git a/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts b/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts
index 625dc110..8c9f3bd8 100644
--- a/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts
@@ -3,7 +3,7 @@ import { DrawingsDataSource } from '../../../../../cartography/datasources/drawi
 import { NodesDataSource } from '../../../../../cartography/datasources/nodes-datasource';
 import { Drawing } from '../../../../../cartography/models/drawing';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { DrawingService } from '../../../../../services/drawing.service';
 import { NodeService } from '../../../../../services/node.service';
 
diff --git a/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.ts b/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.ts
index 0416dd9c..f7ae3d63 100644
--- a/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { ElectronService } from 'ngx-electron';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 
 @Component({
   selector: 'app-open-file-explorer-action',
diff --git a/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts b/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts
index bf10db5a..ec5d22c4 100644
--- a/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts
@@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Link } from '../../../../../models/link';
 import { Project } from '../../../../../models/project';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { PacketFiltersDialogComponent } from '../../../packet-capturing/packet-filters/packet-filters.component';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.ts b/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.ts
index 2754620c..af495df8 100644
--- a/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.ts b/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.ts
index 908a4685..75c98bd4 100644
--- a/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 import { Link } from '../../../../../models/link';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { LinkService } from '../../../../../services/link.service';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts b/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts
index 1509cda7..d9c50730 100644
--- a/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { InfoDialogComponent } from '../../../info-dialog/info-dialog.component';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.ts b/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.ts
index 442d267e..d663eff8 100644
--- a/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.ts
+++ b/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { Link } from '../../../../../models/link';
 import { Project } from '../../../../../models/project';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { PacketCaptureService } from '../../../../../services/packet-capture.service';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts b/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts
index e68461cf..daf6572f 100644
--- a/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts
@@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Link } from '../../../../../models/link';
 import { Project } from '../../../../../models/project';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { StartCaptureDialogComponent } from '../../../packet-capturing/start-capture/start-capture.component';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.ts b/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.ts
index fd735d00..024f9855 100644
--- a/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnChanges, OnInit } from '@angular/core';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 import { ToasterService } from '../../../../../services/toaster.service';
 
diff --git a/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.ts b/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.ts
index e9bf2c53..b3416ca0 100644
--- a/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 import { Link } from '../../../../../models/link';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { LinkService } from '../../../../../services/link.service';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.ts b/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.ts
index 56106f09..d9d4838e 100644
--- a/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnChanges, OnInit } from '@angular/core';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.ts b/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.ts
index 50690cc8..b11e7304 100644
--- a/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 import { Link } from '../../../../../models/link';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { LinkService } from '../../../../../services/link.service';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.ts b/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.ts
index 9ba7109d..12b299c0 100644
--- a/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnChanges, OnInit } from '@angular/core';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 
 @Component({
diff --git a/src/app/components/project-map/context-menu/actions/unisolate-node-action/unisolate-node-action.component.ts b/src/app/components/project-map/context-menu/actions/unisolate-node-action/unisolate-node-action.component.ts
index 2793077f..e0107fde 100644
--- a/src/app/components/project-map/context-menu/actions/unisolate-node-action/unisolate-node-action.component.ts
+++ b/src/app/components/project-map/context-menu/actions/unisolate-node-action/unisolate-node-action.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 import { ToasterService } from '../../../../../services/toaster.service';
 
diff --git a/src/app/components/project-map/context-menu/context-menu.component.spec.ts b/src/app/components/project-map/context-menu/context-menu.component.spec.ts
index 55673af6..d25e911b 100644
--- a/src/app/components/project-map/context-menu/context-menu.component.spec.ts
+++ b/src/app/components/project-map/context-menu/context-menu.component.spec.ts
@@ -6,7 +6,7 @@ import { ElectronService } from 'ngx-electron';
 import { Drawing } from '../../../cartography/models/drawing';
 import { RectElement } from '../../../cartography/models/drawings/rect-element';
 import { TextElement } from '../../../cartography/models/drawings/text-element';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { ProjectService } from '../../../services/project.service';
 import { MockedProjectService } from '../../projects/add-blank-project-dialog/add-blank-project-dialog.component.spec';
 import { ContextMenuComponent } from './context-menu.component';
diff --git a/src/app/components/project-map/context-menu/context-menu.component.ts b/src/app/components/project-map/context-menu/context-menu.component.ts
index b70c771d..3e99ae2d 100644
--- a/src/app/components/project-map/context-menu/context-menu.component.ts
+++ b/src/app/components/project-map/context-menu/context-menu.component.ts
@@ -9,7 +9,7 @@ import { Node } from '../../../cartography/models/node';
 import { Link } from '../../../models/link';
 import { LinkNode } from '../../../models/link-node';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { ProjectService } from '../../../services/project.service';
 
 @Component({
diff --git a/src/app/components/project-map/drawings-editors/link-style-editor/link-style-editor.component.ts b/src/app/components/project-map/drawings-editors/link-style-editor/link-style-editor.component.ts
index 91192d67..61eeaa31 100644
--- a/src/app/components/project-map/drawings-editors/link-style-editor/link-style-editor.component.ts
+++ b/src/app/components/project-map/drawings-editors/link-style-editor/link-style-editor.component.ts
@@ -3,7 +3,7 @@ import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators }
 import { MatDialogRef } from '@angular/material/dialog';
 import { Link } from '../../../../models/link';
 import { Project } from '../../../../models/project';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { ToasterService } from '../../../../services/toaster.service';
 import { NonNegativeValidator } from '../../../../validators/non-negative-validator';
 import { LinkService } from '../../../../services/link.service';
diff --git a/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts b/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts
index 2021667d..431ee467 100644
--- a/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts
+++ b/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts
@@ -15,7 +15,7 @@ import { Node } from '../../../../cartography/models/node';
 import { Link } from '../../../../models/link';
 import { LinkNode } from '../../../../models/link-node';
 import { Project } from '../../../../models/project';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { DrawingService } from '../../../../services/drawing.service';
 import { LinkService } from '../../../../services/link.service';
 import { NodeService } from '../../../../services/node.service';
diff --git a/src/app/components/project-map/import-appliance/import-appliance.component.ts b/src/app/components/project-map/import-appliance/import-appliance.component.ts
index b1ed5cdc..03c733c2 100644
--- a/src/app/components/project-map/import-appliance/import-appliance.component.ts
+++ b/src/app/components/project-map/import-appliance/import-appliance.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnInit } from '@angular/core';
 import { environment } from 'environments/environment';
 import { FileItem, FileUploader, ParsedResponseHeaders } from 'ng2-file-upload';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { DockerTemplate } from '../../../models/templates/docker-template';
 import { IosTemplate } from '../../../models/templates/ios-template';
 import { IouTemplate } from '../../../models/templates/iou-template';
diff --git a/src/app/components/project-map/info-dialog/info-dialog.component.ts b/src/app/components/project-map/info-dialog/info-dialog.component.ts
index 56a10ad3..8af19a5c 100644
--- a/src/app/components/project-map/info-dialog/info-dialog.component.ts
+++ b/src/app/components/project-map/info-dialog/info-dialog.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { MatDialogRef } from '@angular/material/dialog';
 import { Node } from '../../../cartography/models/node';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { InfoService } from '../../../services/info.service';
 
 @Component({
diff --git a/src/app/components/project-map/log-console/log-console.component.spec.ts b/src/app/components/project-map/log-console/log-console.component.spec.ts
index 22e0126b..a161f46c 100644
--- a/src/app/components/project-map/log-console/log-console.component.spec.ts
+++ b/src/app/components/project-map/log-console/log-console.component.spec.ts
@@ -10,7 +10,7 @@ import { ProtocolHandlerService } from '../../../services/protocol-handler.servi
 import { of } from 'rxjs';
 import { NodesDataSource } from '../../../cartography/datasources/nodes-datasource';
 import { ProjectWebServiceHandler, WebServiceMessage } from '../../../handlers/project-web-service-handler';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { HttpController, ControllerErrorHandler } from '../../../services/http-controller.service';
 import { NodeService } from '../../../services/node.service';
 import { NodeConsoleService } from '../../../services/nodeConsole.service';
diff --git a/src/app/components/project-map/log-console/log-console.component.ts b/src/app/components/project-map/log-console/log-console.component.ts
index 5bb74afb..36341ba7 100644
--- a/src/app/components/project-map/log-console/log-console.component.ts
+++ b/src/app/components/project-map/log-console/log-console.component.ts
@@ -19,7 +19,7 @@ import { Link } from '../../../models/link';
 import { LogEvent } from '../../../models/logEvent';
 import { Port } from '../../../models/port';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { HttpController } from '../../../services/http-controller.service';
 import { NodeService } from '../../../services/node.service';
 import { NodeConsoleService } from '../../../services/nodeConsole.service';
diff --git a/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.ts b/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.ts
index 8156d2cb..be1d1ada 100644
--- a/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.ts
+++ b/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.ts
@@ -2,7 +2,7 @@ import { Component, Inject, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { Router } from '@angular/router';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { Template } from '../../../../models/template';
 import { TemplateService } from '../../../../services/template.service';
 import { ToasterService } from '../../../../services/toaster.service';
diff --git a/src/app/components/project-map/node-editors/config-editor/config-editor.component.spec.ts b/src/app/components/project-map/node-editors/config-editor/config-editor.component.spec.ts
index 82205692..d73f7b98 100644
--- a/src/app/components/project-map/node-editors/config-editor/config-editor.component.spec.ts
+++ b/src/app/components/project-map/node-editors/config-editor/config-editor.component.spec.ts
@@ -7,7 +7,7 @@ import { MatTabsModule } from '@angular/material/tabs';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { of } from 'rxjs/internal/observable/of';
 import { Node } from '../../../../cartography/models/node';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { NodeService } from '../../../../services/node.service';
 import { ToasterService } from '../../../../services/toaster.service';
 import { MockedNodeService } from '../../project-map.component.spec';
diff --git a/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts b/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts
index b069c724..2e361694 100644
--- a/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts
+++ b/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { MatDialogRef } from '@angular/material/dialog';
 import { Node } from '../../../../cartography/models/node';
 import { Project } from '../../../../models/project';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { NodeService } from '../../../../services/node.service';
 import { ToasterService } from '../../../../services/toaster.service';
 
diff --git a/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts b/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts
index 769b4b25..86019a49 100644
--- a/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts
+++ b/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { MatDialogRef } from '@angular/material/dialog';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 import { ToasterService } from '../../../../../services/toaster.service';
 
diff --git a/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts b/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts
index 52add138..4f61fbcd 100644
--- a/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts
+++ b/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts
@@ -5,7 +5,7 @@ import { Node } from '../../../../../cartography/models/node';
 import { UdpTunnelsComponent } from '../../../../../components/preferences/common/udp-tunnels/udp-tunnels.component';
 import { PortsMappingEntity } from '../../../../../models/ethernetHub/ports-mapping-enity';
 import { QemuBinary } from '../../../../../models/qemu/qemu-binary';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service';
 import { NodeService } from '../../../../../services/node.service';
 import { ToasterService } from '../../../../../services/toaster.service';
diff --git a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts
index 0a734ea0..c90e92b5 100644
--- a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts
+++ b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { DockerConfigurationService } from '../../../../../services/docker-configuration.service';
 import { NodeService } from '../../../../../services/node.service';
 import { ToasterService } from '../../../../../services/toaster.service';
diff --git a/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.ts b/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.ts
index b6ea74e4..c976dc2b 100644
--- a/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.ts
+++ b/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder } from '@angular/forms';
 import { MatDialogRef } from '@angular/material/dialog';
 import { Node } from '../../../../../../cartography/models/node';
-import{ Controller } from '../../../../../../models/controller';
+import { Controller } from '../../../../../../models/controller';
 import { DockerConfigurationService } from '../../../../../../services/docker-configuration.service';
 import { NodeService } from '../../../../../../services/node.service';
 import { ToasterService } from '../../../../../../services/toaster.service';
diff --git a/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.ts b/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.ts
index 0984400a..1e115796 100644
--- a/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.ts
+++ b/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { MatDialogRef } from '@angular/material/dialog';
 import { Node } from '../../../../../../cartography/models/node';
-import{ Controller } from '../../../../../../models/controller';
+import { Controller } from '../../../../../../models/controller';
 import { NodeService } from '../../../../../../services/node.service';
 import { ToasterService } from '../../../../../../services/toaster.service';
 
diff --git a/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts b/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts
index 63c78b7b..7ec90d43 100644
--- a/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts
+++ b/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts
@@ -3,7 +3,7 @@ import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators }
 import { MatDialogRef } from '@angular/material/dialog';
 import { Node } from '../../../../../cartography/models/node';
 import { PortsComponent } from '../../../../../components/preferences/common/ports/ports.component';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { BuiltInTemplatesConfigurationService } from '../../../../../services/built-in-templates-configuration.service';
 import { NodeService } from '../../../../../services/node.service';
 import { ToasterService } from '../../../../../services/toaster.service';
diff --git a/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts b/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts
index 813ae377..41d4072f 100644
--- a/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts
+++ b/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { MatDialogRef } from '@angular/material/dialog';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 import { ToasterService } from '../../../../../services/toaster.service';
 import { VpcsConfigurationService } from '../../../../../services/vpcs-configuration.service';
diff --git a/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts b/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts
index a7ca7d4f..0d14c702 100644
--- a/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts
+++ b/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { MatDialogRef } from '@angular/material/dialog';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { IosConfigurationService } from '../../../../../services/ios-configuration.service';
 import { NodeService } from '../../../../../services/node.service';
 import { ToasterService } from '../../../../../services/toaster.service';
diff --git a/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts b/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts
index c98066e6..f7c061fe 100644
--- a/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts
+++ b/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { MatDialogRef } from '@angular/material/dialog';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { IouConfigurationService } from '../../../../../services/iou-configuration.service';
 import { NodeService } from '../../../../../services/node.service';
 import { ToasterService } from '../../../../../services/toaster.service';
diff --git a/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts b/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts
index be80af17..53bcd7bd 100644
--- a/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts
+++ b/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { MatDialogRef } from '@angular/material/dialog';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 import { ToasterService } from '../../../../../services/toaster.service';
 
diff --git a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts
index 656c2e21..130904f4 100644
--- a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts
+++ b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts
@@ -5,7 +5,7 @@ import { Node } from '../../../../../cartography/models/node';
 import { CustomAdaptersTableComponent } from '../../../../../components/preferences/common/custom-adapters-table/custom-adapters-table.component';
 import { QemuBinary } from '../../../../../models/qemu/qemu-binary';
 import { QemuImage } from '../../../../../models/qemu/qemu-image';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 import { QemuConfigurationService } from '../../../../../services/qemu-configuration.service';
 import { QemuService } from '../../../../../services/qemu.service';
diff --git a/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts b/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts
index 40a215d5..8ecabe57 100644
--- a/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts
+++ b/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { MatDialogRef } from '@angular/material/dialog';
 import { QemuImg } from '../../../../../../models/qemu/qemu-img';
-import{ Controller } from '../../../../../../models/controller';
+import { Controller } from '../../../../../../models/controller';
 import { NodeService } from '../../../../../../services/node.service';
 import { QemuService } from '../../../../../../services/qemu.service';
 import { ToasterService } from '../../../../../../services/toaster.service';
diff --git a/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts b/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts
index 51692af7..6dec7841 100644
--- a/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts
+++ b/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { MatDialogRef } from '@angular/material/dialog';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 import { ToasterService } from '../../../../../services/toaster.service';
 
diff --git a/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts b/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts
index c0b03269..143b4c4e 100644
--- a/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts
+++ b/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts
@@ -3,7 +3,7 @@ import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators }
 import { MatDialogRef } from '@angular/material/dialog';
 import { Node } from '../../../../../cartography/models/node';
 import { CustomAdaptersTableComponent } from '../../../../../components/preferences/common/custom-adapters-table/custom-adapters-table.component';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 import { ToasterService } from '../../../../../services/toaster.service';
 import { VirtualBoxConfigurationService } from '../../../../../services/virtual-box-configuration.service';
diff --git a/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts b/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts
index f0aad466..a6301bc9 100644
--- a/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts
+++ b/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts
@@ -3,7 +3,7 @@ import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators }
 import { MatDialogRef } from '@angular/material/dialog';
 import { Node } from '../../../../../cartography/models/node';
 import { CustomAdaptersTableComponent } from '../../../../../components/preferences/common/custom-adapters-table/custom-adapters-table.component';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 import { ToasterService } from '../../../../../services/toaster.service';
 import { VmwareConfigurationService } from '../../../../../services/vmware-configuration.service';
diff --git a/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts b/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts
index f10689f4..23b47472 100644
--- a/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts
+++ b/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { MatDialogRef } from '@angular/material/dialog';
 import { Node } from '../../../../../cartography/models/node';
-import{ Controller } from '../../../../../models/controller';
+import { Controller } from '../../../../../models/controller';
 import { NodeService } from '../../../../../services/node.service';
 import { ToasterService } from '../../../../../services/toaster.service';
 import { VpcsConfigurationService } from '../../../../../services/vpcs-configuration.service';
diff --git a/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts b/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts
index ed86dc8d..5f637b5c 100644
--- a/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts
+++ b/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts
@@ -5,7 +5,7 @@ import { FilterDescription } from '../../../../models/filter-description';
 import { Link } from '../../../../models/link';
 import { Message } from '../../../../models/message';
 import { Project } from '../../../../models/project';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { LinkService } from '../../../../services/link.service';
 import { HelpDialogComponent } from '../../help-dialog/help-dialog.component';
 
diff --git a/src/app/components/project-map/project-map.component.spec.ts b/src/app/components/project-map/project-map.component.spec.ts
index f60cb0c3..11e9c556 100644
--- a/src/app/components/project-map/project-map.component.spec.ts
+++ b/src/app/components/project-map/project-map.component.spec.ts
@@ -46,7 +46,7 @@ import { ProjectWebServiceHandler } from '../../handlers/project-web-service-han
 import { CapturingSettings } from '../../models/capturingSettings';
 import { Link } from '../../models/link';
 import { Project } from '../../models/project';
-import{ Controller } from '../../models/controller';
+import { Controller } from '../../models/controller';
 import { DrawingService } from '../../services/drawing.service';
 import { LinkService } from '../../services/link.service';
 import { MapScaleService } from '../../services/mapScale.service';
diff --git a/src/app/components/project-map/project-map.component.ts b/src/app/components/project-map/project-map.component.ts
index 7705a19a..00061727 100644
--- a/src/app/components/project-map/project-map.component.ts
+++ b/src/app/components/project-map/project-map.component.ts
@@ -62,7 +62,7 @@ import { ProgressService } from '../../common/progress/progress.service';
 import { ProjectWebServiceHandler } from '../../handlers/project-web-service-handler';
 import { Link } from '../../models/link';
 import { Project } from '../../models/project';
-import{ Controller } from '../../models/controller';
+import { Controller } from '../../models/controller';
 import { Symbol } from '../../models/symbol';
 import { DrawingService } from '../../services/drawing.service';
 import { MapScaleService } from '../../services/mapScale.service';
diff --git a/src/app/components/project-map/project-readme/project-readme.component.ts b/src/app/components/project-map/project-readme/project-readme.component.ts
index 646c9d25..5fcc7f45 100644
--- a/src/app/components/project-map/project-readme/project-readme.component.ts
+++ b/src/app/components/project-map/project-readme/project-readme.component.ts
@@ -1,6 +1,6 @@
 import { Component, AfterViewInit } from '@angular/core';
 import { MatDialogRef } from '@angular/material/dialog';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { Project } from '../../../models/project';
 import { ProjectService } from '../../../services/project.service';
 import * as marked from 'marked';
@@ -17,7 +17,7 @@ export class ProjectReadmeComponent implements AfterViewInit {
   controller:Controller ;
   project: Project;
   @ViewChild('text', {static: false}) text: ElementRef;
-  
+
   constructor(
     public dialogRef: MatDialogRef<ProjectReadmeComponent>,
     private projectService: ProjectService,
diff --git a/src/app/components/project-map/web-console/web-console.component.ts b/src/app/components/project-map/web-console/web-console.component.ts
index c3df43a3..385f9da4 100644
--- a/src/app/components/project-map/web-console/web-console.component.ts
+++ b/src/app/components/project-map/web-console/web-console.component.ts
@@ -4,7 +4,7 @@ import { AttachAddon } from 'xterm-addon-attach';
 import { FitAddon } from 'xterm-addon-fit';
 import { Node } from '../../../cartography/models/node';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { NodeConsoleService } from '../../../services/nodeConsole.service';
 import { ThemeService } from '../../../services/theme.service';
 
diff --git a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.spec.ts b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.spec.ts
index 349730a1..03a41f2d 100644
--- a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.spec.ts
+++ b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.spec.ts
@@ -8,7 +8,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
 import { of } from 'rxjs/internal/observable/of';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { ProjectService } from '../../../services/project.service';
 import { ToasterService } from '../../../services/toaster.service';
 import { AddBlankProjectDialogComponent } from './add-blank-project-dialog.component';
diff --git a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts
index f8bde8a7..0de2d6cd 100644
--- a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts
+++ b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts
@@ -4,7 +4,7 @@ import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { Router } from '@angular/router';
 import { v4 as uuid } from 'uuid';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { ProjectService } from '../../../services/project.service';
 import { ToasterService } from '../../../services/toaster.service';
 import { projectNameAsyncValidator } from '../../../validators/project-name-async-validator';
diff --git a/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts b/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts
index 7d7e408b..cd80f331 100644
--- a/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts
+++ b/src/app/components/projects/choose-name-dialog/choose-name-dialog.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { MatDialogRef } from '@angular/material/dialog';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { ProjectService } from '../../../services/project.service';
 
 @Component({
diff --git a/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts b/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts
index f8b0bf56..9cb5120e 100644
--- a/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts
+++ b/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, Injectable, ViewChild } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { MatDialogRef } from '@angular/material/dialog';
 import { Project, ProjectVariable } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { ProjectService } from '../../../services/project.service';
 import { ToasterService } from '../../../services/toaster.service';
 import { NonNegativeValidator } from '../../../validators/non-negative-validator';
diff --git a/src/app/components/projects/edit-project-dialog/readme-editor/readme-editor.component.ts b/src/app/components/projects/edit-project-dialog/readme-editor/readme-editor.component.ts
index c61a9ddf..fcbb7eaf 100644
--- a/src/app/components/projects/edit-project-dialog/readme-editor/readme-editor.component.ts
+++ b/src/app/components/projects/edit-project-dialog/readme-editor/readme-editor.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, ViewEncapsulation, Input } from '@angular/core';
 import * as marked from 'marked';
 import { ProjectService } from '../../../../services/project.service';
-import{ Controller } from '../../../../models/controller';
+import { Controller } from '../../../../models/controller';
 import { Project } from '../../../../models/project';
 
 @Component({
diff --git a/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts b/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts
index d28890c8..7553fd31 100644
--- a/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts
+++ b/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts
@@ -15,7 +15,7 @@ import { environment } from 'environments/environment';
 import { FileItem, FileSelectDirective, FileUploadModule } from 'ng2-file-upload';
 import { of } from 'rxjs/internal/observable/of';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { ProjectService } from '../../../services/project.service';
 import { ImportProjectDialogComponent } from './import-project-dialog.component';
 import { ToasterService } from '../../../services/toaster.service';
diff --git a/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts b/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts
index 22d0ff2f..19a7e9f4 100644
--- a/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts
+++ b/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts
@@ -5,7 +5,7 @@ import { ToasterService } from '../../../services/toaster.service';
 import { FileItem, FileUploader, ParsedResponseHeaders } from 'ng2-file-upload';
 import { v4 as uuid } from 'uuid';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { ControllerResponse } from '../../../models/controllerResponse';
 import { ProjectService } from '../../../services/project.service';
 import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component';
diff --git a/src/app/components/projects/projects.component.spec.ts b/src/app/components/projects/projects.component.spec.ts
index 68ab950c..1b0c7129 100644
--- a/src/app/components/projects/projects.component.spec.ts
+++ b/src/app/components/projects/projects.component.spec.ts
@@ -17,7 +17,7 @@ import { of } from 'rxjs';
 import { ProgressService } from '../../common/progress/progress.service';
 import { ProjectsFilter } from '../../filters/projectsFilter.pipe';
 import { Project } from '../../models/project';
-import{ Controller } from '../../models/controller';
+import { Controller } from '../../models/controller';
 import { ProjectService } from '../../services/project.service';
 import { MockedProjectService } from '../../services/project.service.spec';
 import { ControllerService } from '../../services/controller.service';
diff --git a/src/app/components/projects/projects.component.ts b/src/app/components/projects/projects.component.ts
index d1c41224..29548447 100644
--- a/src/app/components/projects/projects.component.ts
+++ b/src/app/components/projects/projects.component.ts
@@ -10,7 +10,7 @@ import { BehaviorSubject, merge, Observable } from 'rxjs';
 import { map } from 'rxjs//operators';
 import { ProgressService } from '../../common/progress/progress.service';
 import { Project } from '../../models/project';
-import{ Controller } from '../../models/controller';
+import { Controller } from '../../models/controller';
 import { ProjectService } from '../../services/project.service';
 import { RecentlyOpenedProjectService } from '../../services/recentlyOpenedProject.service';
 import { Settings, SettingsService } from '../../services/settings.service';
diff --git a/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts b/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts
index 875df767..a40a9027 100644
--- a/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts
+++ b/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts
@@ -3,7 +3,7 @@ import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators }
 import { MatDialogRef } from '@angular/material/dialog';
 import { NodesDataSource } from '../../../cartography/datasources/nodes-datasource';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { ProjectService } from '../../../services/project.service';
 import { ToasterService } from '../../../services/toaster.service';
 import { ProjectNameValidator } from '../models/projectNameValidator';
diff --git a/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts b/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts
index e2bcbb65..70f27d47 100644
--- a/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts
+++ b/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts
@@ -4,7 +4,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { NodesDataSource } from '../../../cartography/datasources/nodes-datasource';
 import { Node } from '../../../cartography/models/node';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { Snapshot } from '../../../models/snapshot';
 import { SnapshotService } from '../../../services/snapshot.service';
 import { ToasterService } from '../../../services/toaster.service';
diff --git a/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts b/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts
index 8078fa83..876bf9b7 100644
--- a/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts
+++ b/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts
@@ -15,7 +15,7 @@ import { of } from 'rxjs';
 import { ProgressDialogService } from '../../../common/progress-dialog/progress-dialog.service';
 import { DateFilter } from '../../../filters/dateFilter.pipe';
 import { NameFilter } from '../../../filters/nameFilter.pipe';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { Snapshot } from '../../../models/snapshot';
 import { ControllerResolve } from '../../../resolvers/controller-resolve';
 import { SnapshotService } from '../../../services/snapshot.service';
diff --git a/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts b/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts
index f1e4754b..940d7868 100644
--- a/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts
+++ b/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { Sort } from '@angular/material/sort';
 import { ActivatedRoute } from '@angular/router';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { ProgressDialogComponent } from '../../../common/progress-dialog/progress-dialog.component';
 import { ProgressDialogService } from '../../../common/progress-dialog/progress-dialog.service';
 import { Project } from '../../../models/project';
diff --git a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts
index 1a6c4ac8..6f719caa 100644
--- a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts
+++ b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts
@@ -3,7 +3,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { ProgressDialogComponent } from '../../../common/progress-dialog/progress-dialog.component';
 import { ProgressDialogService } from '../../../common/progress-dialog/progress-dialog.service';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { Snapshot } from '../../../models/snapshot';
 import { SnapshotService } from '../../../services/snapshot.service';
 import { ToasterService } from '../../../services/toaster.service';
diff --git a/src/app/components/system-status/status-info/status-info.component.ts b/src/app/components/system-status/status-info/status-info.component.ts
index 71abe6ab..775d3e0b 100644
--- a/src/app/components/system-status/status-info/status-info.component.ts
+++ b/src/app/components/system-status/status-info/status-info.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { ComputeStatistics } from '../../../models/computeStatistics';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { ComputeService } from '../../../services/compute.service';
 import { ControllerService } from '../../../services/controller.service';
 import { ToasterService } from '../../../services/toaster.service';
diff --git a/src/app/components/template/template-list-dialog/template-list-dialog.component.ts b/src/app/components/template/template-list-dialog/template-list-dialog.component.ts
index 3d281b74..9bad6ca2 100644
--- a/src/app/components/template/template-list-dialog/template-list-dialog.component.ts
+++ b/src/app/components/template/template-list-dialog/template-list-dialog.component.ts
@@ -5,7 +5,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { BehaviorSubject, merge, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { Project } from '../../../models/project';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 import { Template } from '../../../models/template';
 import { TemplateService } from '../../../services/template.service';
 import { ToasterService } from '../../../services/toaster.service';
diff --git a/src/app/components/template/template.component.ts b/src/app/components/template/template.component.ts
index 505432b2..15af63b3 100644
--- a/src/app/components/template/template.component.ts
+++ b/src/app/components/template/template.component.ts
@@ -4,7 +4,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { ThemeService } from '../../services/theme.service';
 import { Subscription } from 'rxjs';
 import { Project } from '../../models/project';
-import{ Controller } from '../../models/controller';
+import { Controller } from '../../models/controller';
 import { Template } from '../../models/template';
 import { MapScaleService } from '../../services/mapScale.service';
 import { SymbolService } from '../../services/symbol.service';
diff --git a/src/app/components/topology-summary/topology-summary.component.spec.ts b/src/app/components/topology-summary/topology-summary.component.spec.ts
index 0df56648..b638fb7d 100644
--- a/src/app/components/topology-summary/topology-summary.component.spec.ts
+++ b/src/app/components/topology-summary/topology-summary.component.spec.ts
@@ -12,7 +12,7 @@ import { LinksDataSource } from '../../cartography/datasources/links-datasource'
 import { NodesDataSource } from '../../cartography/datasources/nodes-datasource';
 import { Node } from '../../cartography/models/node';
 import { Project } from '../../models/project';
-import{ Controller } from '../../models/controller';
+import { Controller } from '../../models/controller';
 import { ComputeService } from '../../services/compute.service';
 import { ProjectService } from '../../services/project.service';
 import { MockedProjectService } from '../../services/project.service.spec';
diff --git a/src/app/components/topology-summary/topology-summary.component.ts b/src/app/components/topology-summary/topology-summary.component.ts
index f5e783c4..fbf944c0 100644
--- a/src/app/components/topology-summary/topology-summary.component.ts
+++ b/src/app/components/topology-summary/topology-summary.component.ts
@@ -7,7 +7,7 @@ import { Node } from '../../cartography/models/node';
 import { Compute } from '../../models/compute';
 import { Project } from '../../models/project';
 import { ProjectStatistics } from '../../models/project-statistics';
-import{ Controller } from '../../models/controller';
+import { Controller } from '../../models/controller';
 import { ComputeService } from '../../services/compute.service';
 import { ProjectService } from '../../services/project.service';
 import { ThemeService } from '../../services/theme.service';
diff --git a/src/app/components/users/logged-user/logged-user.component.ts b/src/app/components/users/logged-user/logged-user.component.ts
index 56c7f42f..ef8fad70 100644
--- a/src/app/components/users/logged-user/logged-user.component.ts
+++ b/src/app/components/users/logged-user/logged-user.component.ts
@@ -4,7 +4,7 @@ import { ControllerService } from '../../../services/controller.service';
 import { UserService } from '../../../services/user.service';
 import { ToasterService } from '../../../services/toaster.service';
 import { User } from '../../../models/users/user';
-import{ Controller } from '../../../models/controller';
+import { Controller } from '../../../models/controller';
 
 @Component({
   selector: 'app-logged-user',
diff --git a/src/app/components/web-console-full-window/web-console-full-window.component.ts b/src/app/components/web-console-full-window/web-console-full-window.component.ts
index ab490bbf..67d6bad8 100644
--- a/src/app/components/web-console-full-window/web-console-full-window.component.ts
+++ b/src/app/components/web-console-full-window/web-console-full-window.component.ts
@@ -6,7 +6,7 @@ import { Terminal } from 'xterm';
 import { AttachAddon } from 'xterm-addon-attach';
 import { FitAddon } from 'xterm-addon-fit';
 import { Node } from '../../cartography/models/node';
-import{ Controller } from '../../models/controller';
+import { Controller } from '../../models/controller';
 import { NodeService } from '../../services/node.service';
 import { NodeConsoleService } from '../../services/nodeConsole.service';
 import { ControllerService } from '../../services/controller.service';
diff --git a/src/app/guards/login-guard.ts b/src/app/guards/login-guard.ts
index 176c847d..c3411eb4 100644
--- a/src/app/guards/login-guard.ts
+++ b/src/app/guards/login-guard.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
 import { LoginService } from '@services/login.service';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { ControllerService } from '../services/controller.service';
 
 @Injectable()
diff --git a/src/app/resolvers/controller-resolve.ts b/src/app/resolvers/controller-resolve.ts
index 8a1eecd0..57a56d3b 100644
--- a/src/app/resolvers/controller-resolve.ts
+++ b/src/app/resolvers/controller-resolve.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { ControllerService } from '../services/controller.service';
 
 @Injectable()
diff --git a/src/app/services/appliances.service.ts b/src/app/services/appliances.service.ts
index c4c981d3..cf0508ff 100644
--- a/src/app/services/appliances.service.ts
+++ b/src/app/services/appliances.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { environment } from 'environments/environment';
 import { Observable } from 'rxjs';
 import { Appliance } from '../models/appliance';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { HttpController } from './http-controller.service';
 
 @Injectable()
diff --git a/src/app/services/built-in-templates.service.spec.ts b/src/app/services/built-in-templates.service.spec.ts
index 4aafba6d..7ea8e0d0 100644
--- a/src/app/services/built-in-templates.service.spec.ts
+++ b/src/app/services/built-in-templates.service.spec.ts
@@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { inject, TestBed } from '@angular/core/testing';
 import { environment } from 'environments/environment';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { CloudTemplate } from '../models/templates/cloud-template';
 import { EthernetHubTemplate } from '../models/templates/ethernet-hub-template';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
diff --git a/src/app/services/built-in-templates.service.ts b/src/app/services/built-in-templates.service.ts
index cc87be15..ad81c335 100644
--- a/src/app/services/built-in-templates.service.ts
+++ b/src/app/services/built-in-templates.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { HttpController } from './http-controller.service';
 
 @Injectable()
diff --git a/src/app/services/compute.service.ts b/src/app/services/compute.service.ts
index ca62cd9c..d921943f 100644
--- a/src/app/services/compute.service.ts
+++ b/src/app/services/compute.service.ts
@@ -3,7 +3,7 @@ import { environment } from 'environments/environment';
 import { Observable } from 'rxjs';
 import { Compute } from '../models/compute';
 import { ComputeStatistics } from '../models/computeStatistics';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { HttpController } from './http-controller.service';
 
 @Injectable()
diff --git a/src/app/services/controller-management.service.spec.ts b/src/app/services/controller-management.service.spec.ts
index 1784beea..adc48d71 100644
--- a/src/app/services/controller-management.service.spec.ts
+++ b/src/app/services/controller-management.service.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { ElectronService } from 'ngx-electron';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { ControllerManagementService } from './controller-management.service';
 
 describe('ControllerManagementService', () => {
diff --git a/src/app/services/controller-management.service.ts b/src/app/services/controller-management.service.ts
index dd3fd399..d75f7b29 100644
--- a/src/app/services/controller-management.service.ts
+++ b/src/app/services/controller-management.service.ts
@@ -1,7 +1,7 @@
 import { Injectable, OnDestroy } from '@angular/core';
 import { ElectronService } from 'ngx-electron';
 import { Subject } from 'rxjs';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 
 export interface ControllerStateEvent {
   controllerName: string;
diff --git a/src/app/services/controller-settings.service.spec.ts b/src/app/services/controller-settings.service.spec.ts
index 88bbbf62..95bdb237 100644
--- a/src/app/services/controller-settings.service.spec.ts
+++ b/src/app/services/controller-settings.service.spec.ts
@@ -1,7 +1,7 @@
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { inject, TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { QemuSettings } from '../models/settings/qemu-settings';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
 import { HttpController } from './http-controller.service';
diff --git a/src/app/services/controller-settings.service.ts b/src/app/services/controller-settings.service.ts
index da69e52b..d1a38eed 100644
--- a/src/app/services/controller-settings.service.ts
+++ b/src/app/services/controller-settings.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { ControllerSettings } from '../models/controllerSettings';
 import { QemuSettings } from '../models/settings/qemu-settings';
 import { HttpController } from './http-controller.service';
diff --git a/src/app/services/controller.database.ts b/src/app/services/controller.database.ts
index e62b71bd..93a350fc 100644
--- a/src/app/services/controller.database.ts
+++ b/src/app/services/controller.database.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 
 @Injectable()
 export class ControllerDatabase {
diff --git a/src/app/services/controller.service.spec.ts b/src/app/services/controller.service.spec.ts
index d5f89758..624f90f9 100644
--- a/src/app/services/controller.service.spec.ts
+++ b/src/app/services/controller.service.spec.ts
@@ -1,4 +1,4 @@
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 
 export class MockedControllerService {
   public controllers:Controller [] = [];
diff --git a/src/app/services/docker.service.ts b/src/app/services/docker.service.ts
index 56ba348f..6d57f34f 100644
--- a/src/app/services/docker.service.ts
+++ b/src/app/services/docker.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { environment } from 'environments/environment';
 import { Observable } from 'rxjs';
 import { DockerImage } from '../models/docker/docker-image';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { DockerTemplate } from '../models/templates/docker-template';
 import { HttpController } from './http-controller.service';
 
diff --git a/src/app/services/drawing.service.spec.ts b/src/app/services/drawing.service.spec.ts
index 5da7a65d..c097b4a9 100644
--- a/src/app/services/drawing.service.spec.ts
+++ b/src/app/services/drawing.service.spec.ts
@@ -5,7 +5,7 @@ import { environment } from 'environments/environment';
 import { SvgToDrawingConverter } from '../cartography/helpers/svg-to-drawing-converter';
 import { Drawing } from '../cartography/models/drawing';
 import { Project } from '../models/project';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
 import { DrawingService } from './drawing.service';
 import { HttpController } from './http-controller.service';
diff --git a/src/app/services/drawing.service.ts b/src/app/services/drawing.service.ts
index 64bbb8cf..b304b74d 100644
--- a/src/app/services/drawing.service.ts
+++ b/src/app/services/drawing.service.ts
@@ -4,7 +4,7 @@ import 'rxjs/add/operator/map';
 import { SvgToDrawingConverter } from '../cartography/helpers/svg-to-drawing-converter';
 import { Drawing } from '../cartography/models/drawing';
 import { Project } from '../models/project';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { HttpController } from './http-controller.service';
 
 @Injectable()
diff --git a/src/app/services/http-controller.service.spec.ts b/src/app/services/http-controller.service.spec.ts
index 064e2131..49f60985 100644
--- a/src/app/services/http-controller.service.spec.ts
+++ b/src/app/services/http-controller.service.spec.ts
@@ -2,7 +2,7 @@ import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { environment } from 'environments/environment';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
 import { HttpController, ControllerError, ControllerErrorHandler } from './http-controller.service';
 import { getTestController } from './testing';
diff --git a/src/app/services/image-manager.service.spec.ts b/src/app/services/image-manager.service.spec.ts
index 33c241ec..37d7eb93 100644
--- a/src/app/services/image-manager.service.spec.ts
+++ b/src/app/services/image-manager.service.spec.ts
@@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { inject, TestBed } from '@angular/core/testing';
 import { AppTestingModule } from 'app/testing/app-testing/app-testing.module';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { HttpController } from './http-controller.service';
 import { getTestController } from './testing';
 
diff --git a/src/app/services/image-manager.service.ts b/src/app/services/image-manager.service.ts
index 97c2abbb..d0939ae2 100644
--- a/src/app/services/image-manager.service.ts
+++ b/src/app/services/image-manager.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { HttpController } from './http-controller.service';
 import { Observable } from 'rxjs';
 import { Image } from "../models/images";
diff --git a/src/app/services/info.service.ts b/src/app/services/info.service.ts
index eba7b226..b1a4cc94 100644
--- a/src/app/services/info.service.ts
+++ b/src/app/services/info.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Node } from '../cartography/models/node';
 import { Port } from '../models/port';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 
 @Injectable()
 export class InfoService {
diff --git a/src/app/services/ios.service.ts b/src/app/services/ios.service.ts
index d72a1f6e..f21ef7bc 100644
--- a/src/app/services/ios.service.ts
+++ b/src/app/services/ios.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { environment } from 'environments/environment';
 import { Observable } from 'rxjs';
 import { IosImage } from '../models/images/ios-image';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { IosTemplate } from '../models/templates/ios-template';
 import { HttpController } from './http-controller.service';
 
diff --git a/src/app/services/iou.service.ts b/src/app/services/iou.service.ts
index da3f22d9..b986f46e 100644
--- a/src/app/services/iou.service.ts
+++ b/src/app/services/iou.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { environment } from 'environments/environment';
 import { Observable } from 'rxjs';
 import { IouImage } from '../models/iou/iou-image';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { IouTemplate } from '../models/templates/iou-template';
 import { HttpController } from './http-controller.service';
 
diff --git a/src/app/services/link.service.spec.ts b/src/app/services/link.service.spec.ts
index fdb38e6a..92815f1b 100644
--- a/src/app/services/link.service.spec.ts
+++ b/src/app/services/link.service.spec.ts
@@ -4,7 +4,7 @@ import { inject, TestBed } from '@angular/core/testing';
 import { environment } from 'environments/environment';
 import { Node } from '../cartography/models/node';
 import { Port } from '../models/port';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
 import { HttpController } from './http-controller.service';
 import { LinkService } from './link.service';
diff --git a/src/app/services/link.service.ts b/src/app/services/link.service.ts
index 32172390..d41ffb0d 100644
--- a/src/app/services/link.service.ts
+++ b/src/app/services/link.service.ts
@@ -6,7 +6,7 @@ import { FilterDescription } from '../models/filter-description';
 import { Link } from '../models/link';
 import { LinkNode } from '../models/link-node';
 import { Port } from '../models/port';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { HttpController } from './http-controller.service';
 
 @Injectable()
diff --git a/src/app/services/login.service.ts b/src/app/services/login.service.ts
index 71aba465..61f079da 100644
--- a/src/app/services/login.service.ts
+++ b/src/app/services/login.service.ts
@@ -1,7 +1,7 @@
 import { HttpHeaders, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import 'rxjs/add/operator/map';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { HttpController } from './http-controller.service';
 import { AuthResponse } from '../models/authResponse';
 
diff --git a/src/app/services/node.service.spec.ts b/src/app/services/node.service.spec.ts
index 562c8cf7..fd06fc22 100644
--- a/src/app/services/node.service.spec.ts
+++ b/src/app/services/node.service.spec.ts
@@ -5,7 +5,7 @@ import { environment } from 'environments/environment';
 import { Label } from '../cartography/models/label';
 import { Node } from '../cartography/models/node';
 import { Project } from '../models/project';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { Template } from '../models/template';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
 import { HttpController } from './http-controller.service';
diff --git a/src/app/services/node.service.ts b/src/app/services/node.service.ts
index dd0e781a..26d76aab 100644
--- a/src/app/services/node.service.ts
+++ b/src/app/services/node.service.ts
@@ -4,7 +4,7 @@ import 'rxjs/add/operator/map';
 import { Label } from '../cartography/models/label';
 import { Node } from '../cartography/models/node';
 import { Project } from '../models/project';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { Template } from '../models/template';
 import { HttpController } from './http-controller.service';
 
diff --git a/src/app/services/nodeConsole.service.ts b/src/app/services/nodeConsole.service.ts
index a3405788..ee2afd59 100644
--- a/src/app/services/nodeConsole.service.ts
+++ b/src/app/services/nodeConsole.service.ts
@@ -1,5 +1,5 @@
 import { EventEmitter, Injectable } from '@angular/core';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { Subject } from 'rxjs';
 import { Node } from '../cartography/models/node';
 import { Router } from '@angular/router';
diff --git a/src/app/services/notification.service.ts b/src/app/services/notification.service.ts
index e0f01206..da4e9263 100644
--- a/src/app/services/notification.service.ts
+++ b/src/app/services/notification.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { environment } from 'environments/environment';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 
 @Injectable()
 export class NotificationService {
@@ -13,7 +13,7 @@ export class NotificationService {
     return `${protocol}://${controller.host}:${controller.port}/${environment.current_version}/notifications/ws?token=${controller.authToken}`;
   }
 
-  
+
   projectNotificationsPath(controller:Controller , project_id: string): string {
     let protocol:string = "ws"
 	  if (controller.protocol === "https:") {
diff --git a/src/app/services/project.service.spec.ts b/src/app/services/project.service.spec.ts
index 5d1f5502..e839c8c1 100644
--- a/src/app/services/project.service.spec.ts
+++ b/src/app/services/project.service.spec.ts
@@ -4,7 +4,7 @@ import { TestBed } from '@angular/core/testing';
 import { environment } from 'environments/environment';
 import { of } from 'rxjs';
 import { Project } from '../models/project';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
 import { HttpController } from './http-controller.service';
 import { ProjectService } from './project.service';
diff --git a/src/app/services/project.service.ts b/src/app/services/project.service.ts
index 3a3af1e6..81363378 100644
--- a/src/app/services/project.service.ts
+++ b/src/app/services/project.service.ts
@@ -5,7 +5,7 @@ import { Drawing } from '../cartography/models/drawing';
 import { Node } from '../cartography/models/node';
 import { Link } from '../models/link';
 import { Project } from '../models/project';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { HttpController } from './http-controller.service';
 import { RecentlyOpenedProjectService } from './recentlyOpenedProject.service';
 import { SettingsService } from './settings.service';
@@ -155,4 +155,4 @@ getProjectStatus(controller :Controller, project_id: string): Observable<any> {
   projectUpdateLockIcon(){
     this.projectLockIconSubject.next(true)
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/services/qemu.service.spec.ts b/src/app/services/qemu.service.spec.ts
index 5461844e..30642d41 100644
--- a/src/app/services/qemu.service.spec.ts
+++ b/src/app/services/qemu.service.spec.ts
@@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { inject, TestBed } from '@angular/core/testing';
 import { environment } from 'environments/environment';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { QemuTemplate } from '../models/templates/qemu-template';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
 import { HttpController } from './http-controller.service';
diff --git a/src/app/services/qemu.service.ts b/src/app/services/qemu.service.ts
index 88d8d461..e42c87f5 100644
--- a/src/app/services/qemu.service.ts
+++ b/src/app/services/qemu.service.ts
@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { QemuBinary } from '../models/qemu/qemu-binary';
 import { QemuImage } from '../models/qemu/qemu-image';
 import { QemuImg } from '../models/qemu/qemu-img';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { QemuTemplate } from '../models/templates/qemu-template';
 import { HttpController } from './http-controller.service';
 
diff --git a/src/app/services/snapshot.service.spec.ts b/src/app/services/snapshot.service.spec.ts
index 878daa3b..9d8dab6a 100644
--- a/src/app/services/snapshot.service.spec.ts
+++ b/src/app/services/snapshot.service.spec.ts
@@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { inject, TestBed } from '@angular/core/testing';
 import { environment } from 'environments/environment';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { Snapshot } from '../models/snapshot';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
 import { HttpController } from './http-controller.service';
diff --git a/src/app/services/snapshot.service.ts b/src/app/services/snapshot.service.ts
index cc03bb51..43747f5f 100644
--- a/src/app/services/snapshot.service.ts
+++ b/src/app/services/snapshot.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { Snapshot } from '../models/snapshot';
 import { HttpController } from './http-controller.service';
 
diff --git a/src/app/services/symbol.service.spec.ts b/src/app/services/symbol.service.spec.ts
index f865bfe3..d36ab9ca 100644
--- a/src/app/services/symbol.service.spec.ts
+++ b/src/app/services/symbol.service.spec.ts
@@ -3,7 +3,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
 import { inject, TestBed } from '@angular/core/testing';
 import { environment } from 'environments/environment';
 import { of } from 'rxjs';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { Symbol } from '../models/symbol';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
 import { HttpController } from './http-controller.service';
diff --git a/src/app/services/symbol.service.ts b/src/app/services/symbol.service.ts
index f5f87f42..8436cf5e 100644
--- a/src/app/services/symbol.service.ts
+++ b/src/app/services/symbol.service.ts
@@ -3,7 +3,7 @@ import { Template } from '../models/template';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { shareReplay } from 'rxjs/operators';
 import { Node } from '../cartography/models/node';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { Symbol } from '../models/symbol';
 import { HttpController } from './http-controller.service';
 import { environment } from 'environments/environment';
diff --git a/src/app/services/template.service.spec.ts b/src/app/services/template.service.spec.ts
index 46232238..d18e2265 100644
--- a/src/app/services/template.service.spec.ts
+++ b/src/app/services/template.service.spec.ts
@@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { environment } from 'environments/environment';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
 import { HttpController } from './http-controller.service';
 import { TemplateService } from './template.service';
diff --git a/src/app/services/template.service.ts b/src/app/services/template.service.ts
index 84e0fcc6..2711141c 100644
--- a/src/app/services/template.service.ts
+++ b/src/app/services/template.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Observable, Subject } from 'rxjs';
 import 'rxjs/add/operator/map';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { Template } from '../models/template';
 import { HttpController } from './http-controller.service';
 
diff --git a/src/app/services/testing.ts b/src/app/services/testing.ts
index 040d6dce..90ccb094 100644
--- a/src/app/services/testing.ts
+++ b/src/app/services/testing.ts
@@ -1,4 +1,4 @@
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 
 export function getTestController():Controller  {
   const controller = new Controller  ();
diff --git a/src/app/services/version.service.spec.ts b/src/app/services/version.service.spec.ts
index d24e2b10..b692d897 100644
--- a/src/app/services/version.service.spec.ts
+++ b/src/app/services/version.service.spec.ts
@@ -3,7 +3,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
 import { inject, TestBed } from '@angular/core/testing';
 import { environment } from 'environments/environment';
 import { Observable } from 'rxjs/Rx';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
 import { HttpController } from './http-controller.service';
 import { getTestController } from './testing';
diff --git a/src/app/services/version.service.ts b/src/app/services/version.service.ts
index c8081a43..acd070b8 100644
--- a/src/app/services/version.service.ts
+++ b/src/app/services/version.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import 'rxjs/add/operator/map';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { Version } from '../models/version';
 import { HttpController } from './http-controller.service';
 
diff --git a/src/app/services/virtual-box.service.spec.ts b/src/app/services/virtual-box.service.spec.ts
index b7cab96a..82988cd1 100644
--- a/src/app/services/virtual-box.service.spec.ts
+++ b/src/app/services/virtual-box.service.spec.ts
@@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { inject, TestBed } from '@angular/core/testing';
 import { environment } from 'environments/environment';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { VirtualBoxTemplate } from '../models/templates/virtualbox-template';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
 import { HttpController } from './http-controller.service';
diff --git a/src/app/services/virtual-box.service.ts b/src/app/services/virtual-box.service.ts
index cb9cb58f..7c0f82db 100644
--- a/src/app/services/virtual-box.service.ts
+++ b/src/app/services/virtual-box.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { environment } from 'environments/environment';
 import { Observable } from 'rxjs';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { VirtualBoxTemplate } from '../models/templates/virtualbox-template';
 import { VirtualBoxVm } from '../models/virtualBox/virtual-box-vm';
 import { HttpController } from './http-controller.service';
diff --git a/src/app/services/vmware.service.spec.ts b/src/app/services/vmware.service.spec.ts
index 6019cbdc..0d5b97a8 100644
--- a/src/app/services/vmware.service.spec.ts
+++ b/src/app/services/vmware.service.spec.ts
@@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { inject, TestBed } from '@angular/core/testing';
 import { environment } from 'environments/environment';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { VmwareTemplate } from '../models/templates/vmware-template';
 import { AppTestingModule } from '../testing/app-testing/app-testing.module';
 import { HttpController } from './http-controller.service';
diff --git a/src/app/services/vmware.service.ts b/src/app/services/vmware.service.ts
index 0a6075b9..a5a7536d 100644
--- a/src/app/services/vmware.service.ts
+++ b/src/app/services/vmware.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { environment } from 'environments/environment';
 import { Observable } from 'rxjs';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { VmwareTemplate } from '../models/templates/vmware-template';
 import { VmwareVm } from '../models/vmware/vmware-vm';
 import { HttpController } from './http-controller.service';
diff --git a/src/app/services/vpcs.service.ts b/src/app/services/vpcs.service.ts
index 18fc7d44..95cfa70e 100644
--- a/src/app/services/vpcs.service.ts
+++ b/src/app/services/vpcs.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { VpcsTemplate } from '../models/templates/vpcs-template';
 import { HttpController } from './http-controller.service';
 
diff --git a/src/app/validators/project-name-async-validator.ts b/src/app/validators/project-name-async-validator.ts
index e8b50242..a2516dc9 100644
--- a/src/app/validators/project-name-async-validator.ts
+++ b/src/app/validators/project-name-async-validator.ts
@@ -1,7 +1,7 @@
 import { UntypedFormControl } from '@angular/forms';
 import { timer } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { ProjectService } from '../services/project.service';
 
 export const projectNameAsyncValidator = (controller:Controller , projectService: ProjectService) => {
diff --git a/src/app/validators/template-name-async-validator.ts b/src/app/validators/template-name-async-validator.ts
index 995e3ad4..52f5d240 100644
--- a/src/app/validators/template-name-async-validator.ts
+++ b/src/app/validators/template-name-async-validator.ts
@@ -1,7 +1,7 @@
 import { UntypedFormControl } from '@angular/forms';
 import { timer } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import{ Controller } from '../models/controller';
+import { Controller } from '../models/controller';
 import { TemplateService } from '../services/template.service';
 
 export const templateNameAsyncValidator = (controller:Controller , templateService: TemplateService) => {