diff --git a/src/app/components/project-map/project-map.component.html b/src/app/components/project-map/project-map.component.html
index 0fa2d1b6..3ff59f03 100644
--- a/src/app/components/project-map/project-map.component.html
+++ b/src/app/components/project-map/project-map.component.html
@@ -111,6 +111,10 @@
         </div>
       </mat-menu>
 
+      <mat-toolbar-row *ngIf="!readonly">
+        <app-template [server]="server" (onNodeCreation)="onNodeCreation($event)"></app-template>
+      </mat-toolbar-row>
+
       <mat-toolbar-row *ngIf="!readonly">
         <button matTooltip="Add a link" mat-icon-button [color]="tools.draw_link ? 'primary' : 'basic'" (click)="toggleDrawLineMode()">
           <mat-icon>timeline</mat-icon>
@@ -127,10 +131,6 @@
         <app-snapshot-menu-item [server]="server" [project]="project"> </app-snapshot-menu-item>
       </mat-toolbar-row>
 
-      <mat-toolbar-row *ngIf="!readonly">
-        <app-template [server]="server" (onNodeCreation)="onNodeCreation($event)"></app-template>
-      </mat-toolbar-row>
-
       <mat-toolbar-row *ngIf="!readonly">
         <button  matTooltip="Go to preferences" mat-icon-button routerLink="/server/{{server.id}}/preferences">
           <mat-icon>settings_applications</mat-icon>
@@ -160,9 +160,9 @@
 </div>
 
 <div id="zoom-buttons">
-  <button class="zoom-button" (click)="zoomIn()">+</button>
+  <button class="zoom-button" (click)="zoomIn()"><mat-icon>zoom_in</mat-icon></button>
   <button class="zoom-button" (click)="resetZoom()"><mat-icon>adjust</mat-icon></button>
-  <button class="zoom-button" (click)="zoomOut()">-</button>
+  <button class="zoom-button" (click)="zoomOut()"><mat-icon>zoom_out</mat-icon></button>
 </div>
 
 <app-progress></app-progress>
diff --git a/src/app/components/project-map/project-map.component.scss b/src/app/components/project-map/project-map.component.scss
index 118c8972..e7458af0 100644
--- a/src/app/components/project-map/project-map.component.scss
+++ b/src/app/components/project-map/project-map.component.scss
@@ -111,7 +111,7 @@ mat-divider.divider {
     font-weight: bold;
 
     mat-icon {
-      margin-top: 8px;
+      margin-left: -6px;
     }
   }
 
@@ -126,7 +126,7 @@ mat-divider.divider {
     font-weight: bold;
 
     mat-icon {
-      margin-top: 8px;
+      margin-left: -6px;
     }
   } 
 }
diff --git a/src/app/components/project-map/project-map.component.ts b/src/app/components/project-map/project-map.component.ts
index 4835ffb4..b9ff6f07 100644
--- a/src/app/components/project-map/project-map.component.ts
+++ b/src/app/components/project-map/project-map.component.ts
@@ -407,6 +407,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
     this.mapChangeDetectorRef.detectChanges();
   }
 
+  //here we should support adding multiple nodes on single click
   onNodeCreation(template: Template) {
     if(!template) {
       return;
diff --git a/src/app/components/template/template-list-dialog/template-list-dialog.component.html b/src/app/components/template/template-list-dialog/template-list-dialog.component.html
index 3eea74e5..137c5a8d 100644
--- a/src/app/components/template/template-list-dialog/template-list-dialog.component.html
+++ b/src/app/components/template/template-list-dialog/template-list-dialog.component.html
@@ -1,22 +1,78 @@
+<div class="title-container">
+  <h1 mat-dialog-title>Add a node</h1>
+  <button mat-button class="top-button" color="accent" (click)="onNoClick()" routerLink="/server/{{server.id}}/preferences">Go to template preferences</button>
+</div>
 <div mat-dialog-content class="content">
-  <div class="header">
-    <mat-form-field floatPlaceholder="never">
-      <input matInput #filter placeholder="Filter templates" />
-    </mat-form-field>
+  <div class="title-container">
+    <h6>Template</h6>
   </div>
-
-  <mat-table #table [dataSource]="dataSource">
+  <mat-form-field class="form-field" floatPlaceholder="never">
+    <!-- <input matInput #filter placeholder="Filter templates by name" /> -->
+    <input matInput
+    placeholder="Search by name"
+    [(ngModel)]="searchText"
+    [ngModelOptions]="{standalone: true}">
+  </mat-form-field>
+  <mat-form-field class="form-field">
+      <mat-select 
+        [ngModelOptions]="{standalone: true}"  
+        placeholder="Filter templates by type"
+        (selectionChange)="filterTemplates($event)"
+        [(ngModel)]="selectedType">
+        <mat-option *ngFor="let type of templateTypes" [value]="type">
+          {{type}}
+        </mat-option>
+      </mat-select>
+  </mat-form-field>
+  <mat-form-field class="form-field">
+      <mat-select 
+        [ngModelOptions]="{standalone: true}"  
+        placeholder="Choose template"
+        (selectionChange)="chooseTemplate($event)"
+        [(ngModel)]="selectedTemplate">
+        <mat-option *ngFor="let template of templates" [value]="template.name">
+          {{template.name}}
+        </mat-option>
+      </mat-select>
+  </mat-form-field>
+  <!-- <mat-table class="mat-table" #table [dataSource]="dataSource">
     <ng-container matColumnDef="name">
       <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
       <mat-cell *matCellDef="let row">
         <a (click)="addNode(row)" href="javascript:void(0);" class="table-link">{{ row.name }}</a>
       </mat-cell>
     </ng-container>
-
     <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
     <mat-row *matRowDef="let row; columns: displayedColumns"></mat-row>
-  </mat-table>
+  </mat-table> -->
+
+  <div class="title-container">
+    <h6>Configuration</h6>
+  </div>
+  <form [formGroup]="configurationForm">
+    <mat-form-field class="form-field">
+      <input matInput formControlName="name" placeholder="Enter name (default is taken from template)" />
+    </mat-form-field>
+    <mat-form-field class="form-field">
+      <input matInput formControlName="numberOfNodes" placeholder="Enter number of nodes (default value is 1)" />
+    </mat-form-field>
+  </form>
+
+  <div class="title-container">
+    <h6>Position</h6>
+  </div>
+  <form [formGroup]="positionForm">
+    Left:&nbsp;
+    <mat-form-field>
+      <input matInput formControlName="left"/>
+    </mat-form-field>
+    Top:&nbsp;
+    <mat-form-field>
+      <input matInput formControlName="top"/>
+    </mat-form-field>
+  </form>
 </div>
 <div mat-dialog-actions align="end">
   <button mat-button (click)="onNoClick()" tabindex="-1" color="accent">Close</button>
+  <button mat-button (click)="onAddClick()" tabindex="2" mat-raised-button color="primary">Add</button>
 </div>
diff --git a/src/app/components/template/template-list-dialog/template-list-dialog.component.scss b/src/app/components/template/template-list-dialog/template-list-dialog.component.scss
index 6b2a2818..62ee0283 100644
--- a/src/app/components/template/template-list-dialog/template-list-dialog.component.scss
+++ b/src/app/components/template/template-list-dialog/template-list-dialog.component.scss
@@ -8,8 +8,8 @@
 }
 
 .mat-table {
-  overflow: auto;
-  max-height: 400px;
+  height: 200px;
+  overflow: scroll;
 }
 
 .mat-form-field {
@@ -17,11 +17,21 @@
   flex-grow: 1;
 }
 
+.form-field {
+  width: 100%;
+}
+
 div {
   scrollbar-color: darkgrey #263238;
   scrollbar-width: thin;
 }
 
+h6 {
+  margin-top: 5px;
+  margin-bottom: 10px;
+  color: #0097a7;
+}
+
 mat-table {
   scrollbar-color: darkgrey #263238;
   scrollbar-width: thin;
@@ -36,6 +46,17 @@ mat-table {
 }
 
 ::-webkit-scrollbar-thumb {
-background-color: darkgrey;
-outline: 1px solid #263238;
+  background-color: darkgrey;
+  outline: 1px solid #263238;
+}
+
+.filterBox {
+  display: flex;
+  justify-content: space-between;
+}
+
+.title-container {
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
 }
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 471305f3..328be6f2 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
@@ -8,6 +8,7 @@ import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators';
 import { Server } from '../../../models/server';
 import { TemplateService } from '../../../services/template.service';
 import { Template } from '../../../models/template';
+import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms';
 
 @Component({
   selector: 'app-template-list-dialog',
@@ -19,32 +20,51 @@ export class TemplateListDialogComponent implements OnInit {
   templateDatabase: TemplateDatabase;
   dataSource: TemplateDataSource;
   displayedColumns = ['name'];
+  templateTypes: string[] = ['cloud', 'ethernet_hub', 'ethernet_switch', 'docker', 'dynamips', 'vpcs', 'traceng', 'virtualbox', 'vmware', 'iou', 'qemu'];
+  selectedType: string;
+  configurationForm: FormGroup;
+  positionForm: FormGroup;
+  templates: Template[];
+  searchText: string;
 
   @ViewChild('filter', {static: true}) filter: ElementRef;
 
   constructor(
     public dialogRef: MatDialogRef<TemplateListDialogComponent>,
     private templateService: TemplateService,
+    private formBuilder: FormBuilder,
     @Inject(MAT_DIALOG_DATA) public data: any
   ) {
     this.server = data['server'];
+    this.configurationForm = this.formBuilder.group({
+      name: new FormControl('new node', Validators.required),
+      numberOfNodes: new FormControl(1, Validators.required)
+    });
+    this.positionForm = this.formBuilder.group({
+      top: new FormControl(0, Validators.required),
+      left: new FormControl(0, Validators.required)
+    });
   }
 
   ngOnInit() {
-    this.templateDatabase = new TemplateDatabase(this.server, this.templateService);
-    this.dataSource = new TemplateDataSource(this.templateDatabase);
+    // this.templateDatabase = new TemplateDatabase(this.server, this.templateService);
+    // this.dataSource = new TemplateDataSource(this.templateDatabase);
 
-    fromEvent(this.filter.nativeElement, 'keyup')
-      .pipe(
-        debounceTime(150),
-        distinctUntilChanged()
-      )
-      .subscribe(() => {
-        if (!this.dataSource) {
-          return;
-        }
-        this.dataSource.filter = this.filter.nativeElement.value;
-      });
+    this.templateService.list(this.server).subscribe((listOfTemplates: Template[]) => {
+      this.templates = listOfTemplates;
+    });
+
+    // fromEvent(this.filter.nativeElement, 'keyup')
+    //   .pipe(
+    //     debounceTime(150),
+    //     distinctUntilChanged()
+    //   )
+    //   .subscribe(() => {
+    //     if (!this.dataSource) {
+    //       return;
+    //     }
+    //     this.dataSource.filter = this.filter.nativeElement.value;
+    //   });
   }
 
   onNoClick(): void {
@@ -54,6 +74,17 @@ export class TemplateListDialogComponent implements OnInit {
   addNode(template: Template): void {
     this.dialogRef.close(template);
   }
+
+  filterTemplates(event) {
+    console.log('filter event ', event);
+  }
+
+  chooseTemplate(event) {
+    console.log('choose event ', event);
+  }
+
+  onAddClick(): void {
+  }
 }
 
 export class TemplateDatabase {
diff --git a/src/app/components/template/template.component.html b/src/app/components/template/template.component.html
index c4fec0c6..a9535011 100644
--- a/src/app/components/template/template.component.html
+++ b/src/app/components/template/template.component.html
@@ -1 +1 @@
-<button  matTooltip="Browse all devices" mat-icon-button (click)="listTemplatesModal()"><mat-icon>add_to_queue</mat-icon></button>
+<button  matTooltip="Add a node" mat-icon-button (click)="listTemplatesModal()"><mat-icon>add_to_queue</mat-icon></button>
diff --git a/src/app/components/template/template.component.ts b/src/app/components/template/template.component.ts
index 9b6675ca..8df8e513 100644
--- a/src/app/components/template/template.component.ts
+++ b/src/app/components/template/template.component.ts
@@ -21,7 +21,6 @@ export class TemplateComponent implements OnInit {
   listTemplatesModal() {
     const dialogRef = this.dialog.open(TemplateListDialogComponent, {
       width: '600px',
-      height: '560px',
       data: {
         server: this.server
       },