diff --git a/quartz-manager-frontend/src/app/app-routing.module.ts b/quartz-manager-frontend/src/app/app-routing.module.ts
index 7d2d1c6..b955e6f 100644
--- a/quartz-manager-frontend/src/app/app-routing.module.ts
+++ b/quartz-manager-frontend/src/app/app-routing.module.ts
@@ -1,15 +1,12 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-import { AppComponent } from './app.component';
-import { LoginComponent } from './views/login';
-import { LoginGuard } from './guards';
-import { GuestGuard, AdminGuard } from './guards';
-import { NotFoundComponent } from './views/not-found';
-import { ChangePasswordComponent } from './views/change-password';
-import { ForbiddenComponent } from './views/forbidden';
+import {NgModule} from '@angular/core';
+import {RouterModule, Routes} from '@angular/router';
+import {LoginComponent} from './views/login';
+import {AdminGuard, GuestGuard} from './guards';
+import {NotFoundComponent} from './views/not-found';
+import {ForbiddenComponent} from './views/forbidden';
+
+import {ManagerComponent} from './views/manager';
 
-import { ManagerComponent } from './views/manager'; 
- 
 export const routes: Routes = [
   {
     path: '',
diff --git a/quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.spec.ts b/quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.spec.ts
index d25ff65..0ebd2cc 100644
--- a/quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.spec.ts
+++ b/quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.spec.ts
@@ -66,7 +66,7 @@ describe('SimpleTriggerConfig', () => {
     expect(submitButton.nativeElement.textContent.trim()).toEqual('Reschedule');
   });
 
-  it('should get display the form if the openTriggerForm method is called', () => {
+  it('should display the form if the openTriggerForm method is called', () => {
     component.openTriggerForm();
     fixture.detectChanges();
 
diff --git a/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.html b/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.html
index 0c722c8..ce1ebd0 100644
--- a/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.html
+++ b/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.html
@@ -8,8 +8,10 @@
   <mat-divider></mat-divider>
   <mat-card-content style="position: relative; height: 100%">
     <mat-nav-list  style="overflow-y: auto; position: absolute; left: 0; right: 0; top: 0; bottom: 0; overflow: auto; height: calc(100% - 3em)">
-      <mat-list-item *ngFor="let triggerKey of getTriggerKeyList()" class="triggerItemList">
-        <a matLine href="...">{{ triggerKey.name }}</a>
+      <mat-list-item *ngFor="let triggerKey of getTriggerKeyList()" class="triggerItemList"
+                     [ngClass]="{'selectedTrigger': triggerKey.name == selectedTrigger.name}">
+<!--        <a matLine href="...">{{ triggerKey.name }}</a>-->
+        <a matLine>{{ triggerKey.name }}</a>
 <!--        <button mat-icon-button (click)="showInfo(link)">-->
 <!--          <mat-icon>info</mat-icon>-->
 <!--        </button>-->
diff --git a/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.scss b/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.scss
index 8507fa3..ccfdc3d 100644
--- a/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.scss
+++ b/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.scss
@@ -19,3 +19,7 @@
   border-radius: 10px;
   border: 3px solid #ffffff;
 }
+
+.selectedTrigger{
+  background-color: #dddddd;
+}
diff --git a/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.ts b/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.ts
index b6428ae..124321b 100644
--- a/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.ts
+++ b/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.ts
@@ -2,6 +2,7 @@ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
 import {TriggerService} from '../../services/trigger.service';
 import {TriggerKey} from '../../model/triggerKey.model';
 import {SimpleTrigger} from '../../model/simple-trigger.model';
+import {MatDialog} from '@angular/material/dialog';
 
 @Component({
   selector: 'qrzmng-trigger-list',
@@ -24,7 +25,8 @@ export class TriggerListComponent implements OnInit {
   @Output() onSelectedTrigger = new EventEmitter<TriggerKey>();
 
   constructor(
-    private triggerService: TriggerService
+    private triggerService: TriggerService,
+    public dialog: MatDialog
   ) { }
 
   ngOnInit() {
@@ -61,6 +63,14 @@ export class TriggerListComponent implements OnInit {
   }
 
   onNewTriggerBtnClicked() {
-    this.onNewTriggerClicked.emit();
+    if (this.triggerKeys && this.triggerKeys.length > 0)
+      this.dialog.open(UnsupportedMultipleJobsDialog)
+    else
+      this.onNewTriggerClicked.emit();
   }
 }
+
+@Component({
+  template: 'Multiple jobs not supported yet - Coming Soon...',
+})
+export class UnsupportedMultipleJobsDialog {}