diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index f87fd595..443fe794 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -215,7 +215,7 @@ const routes: Routes = [
       },
       { path: 'controller/:controller_id/preferences/docker/addtemplate', component: AddDockerTemplateComponent, canActivate: [LoginGuard] },
       { path: 'controller/:controller_id/preferences/iou/templates', component: IouTemplatesComponent, canActivate: [LoginGuard] },
-      { path: 'controller/:controller_id//preferences/iou/templates/:template_id', component: IouTemplateDetailsComponent, canActivate: [LoginGuard] },
+      { path: 'controller/:controller_id/preferences/iou/templates/:template_id', component: IouTemplateDetailsComponent, canActivate: [LoginGuard] },
       {
         path: 'controller/:controller_id/preferences/iou/templates/:template_id/copy',
         component: CopyIouTemplateComponent,
diff --git a/src/app/components/preferences/built-in/built-in-preferences.component.html b/src/app/components/preferences/built-in/built-in-preferences.component.html
index 5b2a8d4c..af679bb8 100644
--- a/src/app/components/preferences/built-in/built-in-preferences.component.html
+++ b/src/app/components/preferences/built-in/built-in-preferences.component.html
@@ -1,7 +1,7 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <div class="col-md-1">
+      <div class=" col col-md-1">
         <button class="top-button" class="cancel-button" routerLink="/controller/{{ controllerId }}/preferences" mat-button>
           <mat-icon>arrow_back</mat-icon>
         </button>
diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.html b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.html
index d9347027..d750544a 100644
--- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.html
+++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.html
@@ -1,7 +1,14 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">New cloud node template</h1>
+      <div class="col col-md-1">
+        <button *ngIf="controller" class="top-button" class="cancel-button col" (click)="goBack()" mat-button>
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col-md-11">
+        <h1 class="col">New cloud node template</h1>
+      </div>
     </div>
   </div>
   <div class="default-content">
diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.html b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.html
index 1c7f8f15..4676a5a5 100644
--- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.html
+++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.html
@@ -45,6 +45,9 @@
             <button mat-menu-item (click)="deleteTemplate(template)">
               <mat-icon>delete</mat-icon><span>Delete</span>
             </button>
+            <button mat-menu-item routerLink="{{ template.template_id }}">
+              <mat-icon>edit</mat-icon><span>Edit</span>
+            </button>
           </mat-menu>
         </div>
       </mat-nav-list>
diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.html b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.html
index 01051a92..f2239c48 100644
--- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.html
+++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.html
@@ -1,7 +1,21 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">New Ethernet hub template</h1>
+      <div class="col-md-1">
+          <button
+          *ngIf="controller"
+          class="top-button"
+          class="cancel-button"
+          (click)="goBack()"
+          mat-button
+        >
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col-md-11">
+        <h1 class="col">New Ethernet hub template</h1>
+
+      </div>
     </div>
   </div>
   <div class="default-content">
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 202ccb82..b4e42950 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
@@ -1,7 +1,20 @@
 <div class="content" [ngClass]="{ shadowed: isSymbolSelectionOpened }">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">Ethernet hub settings</h1>
+      <div class="col-md-1">
+        <button
+        *ngIf="controller"
+        class="top-button"
+        class="cancel-button"
+        (click)="goBack()"
+        mat-button
+      >
+        <mat-icon>arrow_back</mat-icon>
+      </button>
+      </div>
+      <div class="col-md-11">
+        <h1 class="col">Ethernet hub settings</h1>
+      </div>
     </div>
   </div>
   <div class="default-content" *ngIf="ethernetHubTemplate">
diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.html b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.html
index 1560c81d..13d202b6 100644
--- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.html
+++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.html
@@ -44,6 +44,9 @@
             <button mat-menu-item (click)="deleteTemplate(template)">
               <mat-icon>delete</mat-icon><span>Delete</span>
             </button>
+            <button mat-menu-item  routerLink="{{ template.template_id }}">
+              <mat-icon>edit</mat-icon><span>Edit</span>
+            </button>
           </mat-menu>
         </div>
       </mat-nav-list>
diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.html b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.html
index 7467afca..db171295 100644
--- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.html
+++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.html
@@ -1,8 +1,21 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
+    <div class="col col-md-1">
+      <button
+      *ngIf="controller"
+      class="top-button"
+      class="cancel-button col"
+      (click)="goBack()"
+      mat-button
+    >
+      <mat-icon>arrow_back</mat-icon>
+    </button>
+    </div>
+    <div class="col-md-11">
       <h1 class="col">New Ethernet switch template</h1>
     </div>
+    </div>
   </div>
   <div class="default-content">
     <mat-card class="matCard">
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 95dcd875..dcd41345 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
@@ -1,7 +1,14 @@
 <div class="content" [ngClass]="{ shadowed: isSymbolSelectionOpened }">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">Ethernet switch configuration</h1>
+      <div class="col col-md-1">
+        <button *ngIf="controller" class="top-button" class="cancel-button col" (click)="goBack()" mat-button>
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col-md-11">
+        <h1 class="col">Ethernet switch configuration</h1>
+      </div>
     </div>
   </div>
   <div class="default-content" *ngIf="ethernetSwitchTemplate">
diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.html b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.html
index d45820a5..f7b37245 100644
--- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.html
+++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.html
@@ -45,6 +45,9 @@
             <button mat-menu-item (click)="deleteTemplate(template)">
               <mat-icon>delete</mat-icon><span>Delete</span>
             </button>
+            <button mat-menu-item  routerLink="{{ template.template_id }}">
+              <mat-icon>edit</mat-icon><span>Edit</span>
+            </button>
           </mat-menu>
         </div>
       </mat-nav-list>
diff --git a/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.html b/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.html
index 3b2f0f93..7bdf1e83 100644
--- a/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.html
+++ b/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.html
@@ -1,7 +1,14 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
+      <div class="col col-md-1">
+        <button class="top-button" *ngIf="controller" class="cancel-button" (click)="goBack()" mat-button>
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-11">
       <h1 class="col">Copy Docker container template</h1>
+      </div>
     </div>
   </div>
   <div class="default-content">
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 757da7b2..300800eb 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
@@ -1,7 +1,14 @@
 <div class="content" [ngClass]="{ shadowed: isSymbolSelectionOpened }">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">Docker image configuration</h1>
+      <div class="col col-md-1">
+        <button class="top-button" *ngIf="controller" class="cancel-button" (click)="goBack()" mat-button>
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-11">
+        <h1 class="col">Docker image configuration</h1>
+      </div>
     </div>
   </div>
   <div class="default-content" *ngIf="dockerTemplate">
diff --git a/src/app/components/preferences/docker/docker-templates/docker-templates.component.html b/src/app/components/preferences/docker/docker-templates/docker-templates.component.html
index 3ffbf3a5..63ce6675 100644
--- a/src/app/components/preferences/docker/docker-templates/docker-templates.component.html
+++ b/src/app/components/preferences/docker/docker-templates/docker-templates.component.html
@@ -1,26 +1,34 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">Docker container templates</h1>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        class="cancel-button"
-        routerLink="/controller/{{ controller.id }}/preferences"
-        mat-button
-      >
-        Back
-      </button>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        routerLink="/controller/{{ controller.id }}/preferences/docker/addtemplate"
-        mat-raised-button
-        color="primary"
-      >
-        Add Docker container template
-      </button>
+      <div class="col col-md-1">
+        <button
+          class="top-button"
+          *ngIf="controller"
+          class="cancel-button"
+          mat-button
+          routerLink="/controller/{{ controller.id }}/preferences"
+          >
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-10">
+        <h1 class="col">Docker container templates</h1>
+      </div>
+      <div class="col col-md-1">
+        <button
+          *ngIf="controller"
+          class="top-button cancel-button"
+          matTooltip="Add Docker container template"
+          matTooltipClass="custom-tooltip"
+          routerLink="/controller/{{ controller.id }}/preferences/docker/addtemplate"
+          mat-button
+        >
+          <mat-icon>add_circle_outline</mat-icon>
+        </button>
+      </div>
     </div>
+
   </div>
   <app-empty-templates-list *ngIf="!dockerTemplates.length"></app-empty-templates-list>
   <div class="default-content" *ngIf="dockerTemplates.length">
@@ -34,12 +42,15 @@
             <mat-icon>more_vert</mat-icon>
           </button>
           <mat-menu #menu="matMenu">
-            <button mat-menu-item (click)="deleteTemplate(template)">
-              <mat-icon>delete</mat-icon><span>Delete</span>
+            <button mat-menu-item routerLink="{{ template.template_id }}">
+              <mat-icon>edit</mat-icon><span>Edit</span>
             </button>
             <button mat-menu-item (click)="copyTemplate(template)">
               <mat-icon>content_copy</mat-icon><span>Copy</span>
             </button>
+            <button mat-menu-item (click)="deleteTemplate(template)">
+              <mat-icon>delete</mat-icon><span>Delete</span>
+            </button>
           </mat-menu>
         </div>
       </mat-nav-list>
diff --git a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.html b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.html
index b44c6a37..10e77a28 100644
--- a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.html
+++ b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.html
@@ -1,7 +1,20 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">New IOS router template</h1>
+      <div class="col col-md-1">
+        <button
+          class="top-button"
+          *ngIf="controller"
+          class="cancel-button"
+          mat-button
+          (click)="goBack()"
+        >
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-11">
+        <h1 class="col">New IOS router template</h1>
+      </div>
     </div>
   </div>
   <div class="default-content" *ngIf="iosTemplate">
diff --git a/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.html b/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.html
index 3aa2a953..ccf5ee7a 100644
--- a/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.html
+++ b/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.html
@@ -1,7 +1,14 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">Copy IOS router template</h1>
+      <div class="col col-md-1">
+        <button class="top-button" *ngIf="controller" class="cancel-button" mat-button (click)="goBack()">
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-11">
+        <h1 class="col">Copy IOS router template</h1>
+      </div>
     </div>
   </div>
   <div class="default-content">
diff --git a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.html b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.html
index aece948d..0320cac6 100644
--- a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.html
+++ b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.html
@@ -1,25 +1,32 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">IOS router templates</h1>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        class="cancel-button"
-        routerLink="/controller/{{ controller.id }}/preferences"
-        mat-button
-      >
-        Back
-      </button>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        routerLink="/controller/{{ controller.id }}/preferences/dynamips/templates/addtemplate"
-        mat-raised-button
-        color="primary"
-      >
-        Add IOS router template
-      </button>
+      <div class="col col-md-1">
+        <button
+          class="top-button"
+          *ngIf="controller"
+          class="cancel-button"
+          mat-button
+          routerLink="/controller/{{ controller.id }}/preferences"
+        >
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-10">
+        <h1 class="col">IOS router templates</h1>
+      </div>
+      <div class="col col-md-1">
+        <button
+          *ngIf="controller"
+          class="top-button cancel-button"
+          matTooltip="Add IOS router template"
+          matTooltipClass="custom-tooltip"
+          routerLink="/controller/{{ controller.id }}/preferences/dynamips/templates/addtemplate"
+          mat-button
+        >
+          <mat-icon>add_circle_outline</mat-icon>
+        </button>
+      </div>
     </div>
   </div>
   <app-empty-templates-list *ngIf="!iosTemplates.length"></app-empty-templates-list>
@@ -40,6 +47,9 @@
             <button mat-menu-item (click)="copyTemplate(template)">
               <mat-icon>content_copy</mat-icon><span>Copy</span>
             </button>
+            <button mat-menu-item routerLink="{{ template.template_id }}">
+              <mat-icon>edit</mat-icon><span>Edit</span>
+            </button>
           </mat-menu>
         </div>
       </mat-nav-list>
diff --git a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.html b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.html
index 77d51b76..c9481a2d 100644
--- a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.html
+++ b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.html
@@ -1,7 +1,20 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">New IOU device template</h1>
+      <div class="col col-md-1">
+        <button
+          class="top-button"
+          *ngIf="controller"
+          class="cancel-button"
+          mat-button
+          (click)="goBack()"
+        >
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-11">
+        <h1 class="col">New IOU device template</h1>
+      </div>
     </div>
   </div>
   <div class="default-content">
diff --git a/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.html b/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.html
index b9ca4669..9d097e10 100644
--- a/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.html
+++ b/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.html
@@ -1,7 +1,20 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">Copy IOU device template</h1>
+      <div class="col col-md-1">
+        <button
+          class="top-button"
+          *ngIf="controller"
+          class="cancel-button"
+          mat-button
+          (click)="goBack()"
+          >
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-11">
+        <h1 class="col">Copy IOU device template</h1>
+      </div>
     </div>
   </div>
   <div class="default-content">
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 bb834c78..5c0595bf 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
@@ -1,7 +1,16 @@
 <div class="content" [ngClass]="{ shadowed: isSymbolSelectionOpened }">
   <div class="default-header">
     <div class="form-field">
-      <h1 class="col">IOU device configuration</h1>
+      <div class="row">
+        <div class="col col-md-1">
+          <button *ngIf="controller" class="top-button" class="cancel-button" mat-button (click)="goBack()">
+            <mat-icon>arrow_back</mat-icon>
+          </button>
+        </div>
+        <div class="col col-md-11">
+          <h1 class="col">IOU device configuration</h1>
+        </div>
+      </div>
     </div>
   </div>
   <div class="default-content" *ngIf="iouTemplate">
diff --git a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.html b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.html
index 09bd61a5..3408db33 100644
--- a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.html
+++ b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.html
@@ -1,25 +1,31 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">IOU device templates</h1>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        class="cancel-button"
-        routerLink="/controller/{{ controller.id }}/preferences"
-        mat-button
-      >
-        Back
-      </button>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        routerLink="/controller/{{ controller.id }}/preferences/iou/addtemplate"
-        mat-raised-button
-        color="primary"
-      >
-        Add IOU device template
-      </button>
+      <div class="col col-md-1">
+        <button
+          class="top-button"
+          class="cancel-button"
+          routerLink="/controller/{{ controller?.id }}/preferences"
+          mat-button
+        >
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-10">
+        <h1 class="col">IOU device templates</h1>
+      </div>
+      <div class="col col-md-1">
+        <button
+          *ngIf="controller"
+          class="top-button cancel-button"
+          matTooltip="Add IOU device template"
+          matTooltipClass="custom-tooltip"
+          routerLink="/controller/{{ controller?.id }}/preferences/iou/addtemplate"
+          mat-button
+        >
+          <mat-icon>add_circle_outline</mat-icon>
+        </button>
+      </div>
     </div>
   </div>
   <app-empty-templates-list *ngIf="!iouTemplates.length"></app-empty-templates-list>
@@ -40,6 +46,9 @@
             <button mat-menu-item (click)="copyTemplate(template)">
               <mat-icon>content_copy</mat-icon><span>Copy</span>
             </button>
+            <button mat-menu-item routerLink="{{ template.template_id }}">
+              <mat-icon>edit</mat-icon><span>Edit</span>
+            </button>
           </mat-menu>
         </div>
       </mat-nav-list>
diff --git a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html
index 6b71048b..81ce2f46 100644
--- a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html
+++ b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html
@@ -1,7 +1,14 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">New QEMU VM template</h1>
+      <div class="col col-md-1">
+        <button class="top-button" *ngIf="controller" class="cancel-button" mat-button (click)="goBack()">
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-11">
+        <h1 class="col">New QEMU VM template</h1>
+      </div>
     </div>
   </div>
   <div class="default-content">
@@ -32,12 +39,8 @@
         <mat-step label="Platform and memory" [completed]="memoryForm.get('ramMemory').value && selectedPlatform">
           <form [formGroup]="memoryForm">
             <mat-form-field class="form-field">
-              <mat-select
-                placeholder="Platform"
-                [(ngModel)]="selectedPlatform"
-                [ngModelOptions]="{ standalone: true }"
-              >
-                <mat-option *ngFor="let platform of selectPlatform " [value]="platform">
+              <mat-select placeholder="Platform" [(ngModel)]="selectedPlatform" [ngModelOptions]="{ standalone: true }">
+                <mat-option *ngFor="let platform of selectPlatform" [value]="platform">
                   {{ platform }}
                 </mat-option>
               </mat-select> </mat-form-field
@@ -103,7 +106,7 @@
                   placeholder="Please enter name"
                 />
               </mat-form-field>
-             <!-- here removed the processbar and common processbar -->
+              <!-- here removed the processbar and common processbar -->
             </div>
           </form>
         </mat-step>
diff --git a/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.html b/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.html
index 6661ecaa..c64470f4 100644
--- a/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.html
+++ b/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.html
@@ -1,7 +1,14 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">Copy QEMU VM template</h1>
+      <div class="col col-md-1">
+        <button class="top-button" *ngIf="controller" class="cancel-button" mat-button (click)="goBack()">
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-11">
+        <h1 class="col">Copy QEMU VM template</h1>
+      </div>
     </div>
   </div>
   <div class="default-content">
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 7b1e3e27..979515db 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
@@ -1,7 +1,14 @@
 <div class="content" [ngClass]="{ shadowed: isConfiguratorOpened || isSymbolSelectionOpened }">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">QEMU VM configuration</h1>
+      <div class="col col-md-1">
+        <button class="top-button" *ngIf="controller" class="cancel-button" mat-button (click)="goBack()">
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-11">
+        <h1 class="col">QEMU VM configuration</h1>
+      </div>
     </div>
   </div>
   <div class="default-content" *ngIf="qemuTemplate">
diff --git a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.html b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.html
index e4bf6cf3..9731d926 100644
--- a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.html
+++ b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.html
@@ -1,25 +1,33 @@
 <div class="content">
   <div class="default-header">
+
     <div class="row">
-      <h1 class="col">QEMU VM templates</h1>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        class="cancel-button"
-        routerLink="/controller/{{ controller.id }}/preferences"
-        mat-button
-      >
-        Back
-      </button>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        routerLink="/controller/{{ controller.id }}/preferences/qemu/addtemplate"
-        mat-raised-button
-        color="primary"
-      >
-        Add QEMU VM template
-      </button>
+      <div class="col col-md-1">
+        <button
+          class="top-button"
+          *ngIf="controller"
+          class="cancel-button"
+          mat-button
+          routerLink="/controller/{{ controller.id }}/preferences"
+          >
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-10">
+        <h1 class="col">QEMU VM templates</h1>
+      </div>
+      <div class="col col-md-1">
+        <button
+          *ngIf="controller"
+          class="top-button cancel-button"
+          matTooltip="Add QEMU VM template"
+          matTooltipClass="custom-tooltip"
+          routerLink="/controller/{{ controller.id }}/preferences/qemu/addtemplate"
+          mat-button
+        >
+          <mat-icon>add_circle_outline</mat-icon>
+        </button>
+      </div>
     </div>
   </div>
   <app-empty-templates-list *ngIf="!qemuTemplates.length"></app-empty-templates-list>
@@ -34,12 +42,16 @@
             <mat-icon>more_vert</mat-icon>
           </button>
           <mat-menu #menu="matMenu">
-            <button mat-menu-item (click)="deleteTemplate(template)">
-              <mat-icon>delete</mat-icon><span>Delete</span>
+            <button mat-menu-item routerLink="{{ template.template_id }}">
+              <mat-icon>edit</mat-icon><span>Edit</span>
             </button>
             <button mat-menu-item (click)="copyTemplate(template)">
               <mat-icon>content_copy</mat-icon><span>Copy</span>
             </button>
+            <button mat-menu-item (click)="deleteTemplate(template)">
+              <mat-icon>delete</mat-icon><span>Delete</span>
+            </button>
+            
           </mat-menu>
         </div>
       </mat-nav-list>
diff --git a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.html b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.html
index 9e53678d..eb52c5e4 100644
--- a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.html
+++ b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.html
@@ -1,7 +1,20 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">New VirtualBox VM template</h1>
+      <div class="col col-md-1">
+        <button
+          class="top-button"
+          *ngIf="controller"
+          class="cancel-button"
+          mat-button
+          (click)="goBack()"
+        >
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-11">
+        <h1 class="col">New VirtualBox VM template</h1>
+      </div>
     </div>
   </div>
   <div class="default-content" *ngIf="virtualBoxTemplate">
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 f3b93c4b..4c387302 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
@@ -1,7 +1,14 @@
 <div class="content" [ngClass]="{ shadowed: isConfiguratorOpened || isSymbolSelectionOpened }">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">VirtualBox VM configuration</h1>
+      <div class="col col-md-1">
+        <button class="top-button" *ngIf="controller" class="cancel-button" mat-button (click)="goBack()">
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-11">
+        <h1 class="col">VirtualBox VM configuration</h1>
+      </div>
     </div>
   </div>
   <div class="default-content" *ngIf="virtualBoxTemplate">
diff --git a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.html b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.html
index 5ae96cdd..3cfddb45 100644
--- a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.html
+++ b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.html
@@ -1,26 +1,34 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">VirtualBox VM templates</h1>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        class="cancel-button"
-        routerLink="/controller/{{ controller.id }}/preferences"
-        mat-button
-      >
-        Back
-      </button>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        routerLink="/controller/{{ controller.id }}/preferences/virtualbox/addtemplate"
-        mat-raised-button
-        color="primary"
-      >
-        Add Virtual Box VM template
-      </button>
+      <div class="col col-md-1">
+        <button
+          class="top-button"
+          *ngIf="controller"
+          class="cancel-button"
+          mat-button
+          routerLink="/controller/{{ controller.id }}/preferences"
+          >
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-10">
+        <h1 class="col">VirtualBox VM templates</h1>
+      </div>
+      <div class="col col-md-1">
+        <button
+          *ngIf="controller"
+          class="top-button cancel-button"
+          matTooltip="Add Virtual Box VM template"
+          matTooltipClass="custom-tooltip"
+          routerLink="/controller/{{ controller.id }}/preferences/virtualbox/addtemplate"
+          mat-button
+        >
+          <mat-icon>add_circle_outline</mat-icon>
+        </button>
+      </div>
     </div>
+
   </div>
   <app-empty-templates-list *ngIf="!virtualBoxTemplates.length"></app-empty-templates-list>
   <div class="default-content" *ngIf="virtualBoxTemplates.length">
diff --git a/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.html b/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.html
index 40261c2d..ca5e608b 100644
--- a/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.html
+++ b/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.html
@@ -1,7 +1,14 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">New VMware VM template</h1>
+      <div class="col col-md-1">
+        <button class="top-button" *ngIf="controller" class="cancel-button" mat-button (click)="goBack()">
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-11">
+        <h1 class="col">New VMware VM template</h1>
+      </div>
     </div>
   </div>
   <div class="default-content" *ngIf="vmwareTemplate">
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 7c844a01..d22f31cd 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
@@ -1,7 +1,14 @@
 <div class="content" [ngClass]="{ shadowed: isSymbolSelectionOpened || isConfiguratorOpened }">
   <div class="default-header">
     <div class="row">
+      <div class="col col-md-1">
+        <button class="top-button" *ngIf="controller" class="cancel-button" mat-button (click)="goBack()">
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-11">
       <h1 class="col">VMware VM configuration</h1>
+      </div>
     </div>
   </div>
   <div class="default-content" *ngIf="vmwareTemplate">
diff --git a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.html b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.html
index 2ef5e37f..94b32c14 100644
--- a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.html
+++ b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.html
@@ -1,25 +1,33 @@
 <div class="content">
   <div class="default-header">
+
     <div class="row">
-      <h1 class="col">VMware VM templates</h1>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        class="cancel-button"
-        routerLink="/controller/{{ controller.id }}/preferences"
-        mat-button
-      >
-        Back
-      </button>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        routerLink="/controller/{{ controller.id }}/preferences/vmware/addtemplate"
-        mat-raised-button
-        color="primary"
-      >
-        Add VMware template
-      </button>
+      <div class="col col-md-1">
+        <button
+          class="top-button"
+          *ngIf="controller"
+          class="cancel-button"
+          mat-button
+          routerLink="/controller/{{ controller.id }}/preferences"
+          >
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-10">
+        <h1 class="col">VMware VM templates</h1>
+      </div>
+      <div class="col col-md-1">
+        <button
+          *ngIf="controller"
+          class="top-button cancel-button"
+          matTooltip="Add VMware template"
+          matTooltipClass="custom-tooltip"
+          routerLink="/controller/{{ controller.id }}/preferences/vmware/addtemplate"
+          mat-button
+        >
+          <mat-icon>add_circle_outline</mat-icon>
+        </button>
+      </div>
     </div>
   </div>
   <app-empty-templates-list *ngIf="!vmwareTemplates.length"></app-empty-templates-list>
diff --git a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.html b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.html
index 7f5ca097..ae841052 100644
--- a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.html
+++ b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.html
@@ -1,7 +1,20 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">New VPCS node template</h1>
+      <div class="col col-md-1">
+        <button
+          class="top-button"
+          *ngIf="controller"
+          class="cancel-button"
+          mat-button
+          (click)="goBack()"
+        >
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-11">
+        <h1 class="col">New VPCS node template</h1>
+      </div>
     </div>
   </div>
   <div class="default-content">
diff --git a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.html b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.html
index ae396698..1d3db5a1 100644
--- a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.html
+++ b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.html
@@ -1,26 +1,34 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">VPCS node templates</h1>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        class="cancel-button"
-        routerLink="/controller/{{ controller.id }}/preferences"
-        mat-button
-      >
-        Back
-      </button>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        routerLink="/controller/{{ controller.id }}/preferences/vpcs/addtemplate"
-        mat-raised-button
-        color="primary"
-      >
-        Add VPCS template
-      </button>
+      <div class="col col-md-1">
+        <button
+          class="top-button"
+          *ngIf="controller"
+          class="cancel-button"
+          mat-button
+          routerLink="/controller/{{ controller.id }}/preferences"
+          >
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col col-md-10">
+        <h1 class="col">VPCS node templates</h1>
+      </div>
+      <div class="col col-md-1">
+        <button
+          *ngIf="controller"
+          class="top-button cancel-button"
+          matTooltip="Add VPCS template"
+          matTooltipClass="custom-tooltip"
+          routerLink="/controller/{{ controller.id }}/preferences/vpcs/addtemplate"
+          mat-button
+        >
+          <mat-icon>add_circle_outline</mat-icon>
+        </button>
+      </div>
     </div>
+
   </div>
   <app-empty-templates-list *ngIf="!vpcsTemplates.length"></app-empty-templates-list>
   <div class="default-content" *ngIf="vpcsTemplates.length">
@@ -34,6 +42,9 @@
             <mat-icon>more_vert</mat-icon>
           </button>
           <mat-menu #menu="matMenu">
+            <button mat-menu-item routerLink="{{ template.template_id }}">
+              <mat-icon>edit</mat-icon><span>Edit</span>
+            </button>
             <button mat-menu-item (click)="deleteTemplate(template)">
               <mat-icon>delete</mat-icon><span>Delete</span>
             </button>
diff --git a/src/app/services/project.service.ts b/src/app/services/project.service.ts
index 49035b3a..2573aace 100644
--- a/src/app/services/project.service.ts
+++ b/src/app/services/project.service.ts
@@ -73,7 +73,6 @@ export class ProjectService {
   }
 
   links(controller:Controller , project_id: string) {
-    debugger
     return this.httpController.get<Link[]>(controller, `/projects/${project_id}/links`);
   }