diff --git a/src/app/lists/common-components/abstract-list/abstract-list.component.ts b/src/app/lists/common-components/abstract-list/abstract-list.component.ts
index 746a1e0..e5093b8 100644
--- a/src/app/lists/common-components/abstract-list/abstract-list.component.ts
+++ b/src/app/lists/common-components/abstract-list/abstract-list.component.ts
@@ -142,7 +142,7 @@
         this.gridApi.setDatasource(dataSource);
       }, error => {
         console.log(error);
-        this.toasterMessageService.emitError(this.gridId, ErrorType.retrieve, error);
+        this.toasterMessageService.showError(ErrorType.retrieve, error);
       });
     }
   };
diff --git a/src/app/lists/email-distribution-list/email-distribution-list.component.spec.ts b/src/app/lists/email-distribution-list/email-distribution-list.component.spec.ts
index 562c2aa..44bad2b 100644
--- a/src/app/lists/email-distribution-list/email-distribution-list.component.spec.ts
+++ b/src/app/lists/email-distribution-list/email-distribution-list.component.spec.ts
@@ -9,33 +9,24 @@
 *
 ******************************************************************************
 */
-import { ComponentFixture, TestBed, async, fakeAsync, tick } from '@angular/core/testing';
+import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
-import { Router } from '@angular/router';
-import { DaterangepickerConfig } from 'ng2-daterangepicker';
-import { FormattedDatePipe } from '../../common-components/pipes/formatted-date.pipe';
-import { FormattedTimestampPipe } from '../../common-components/pipes/formatted-timestamp.pipe';
-import { StringToDatePipe } from '../../common-components/pipes/string-to-date.pipe';
-import { BannerMessage } from '../../common/banner-message';
-import { BannerMessageStatusEn } from '../../common/enums';
-import { Lock } from '../../model/lock';
-import { GridMeasureService } from '../../services/grid-measure.service';
-import { ReminderService } from '../../services/reminder.service';
-import { LockService } from '../../services/lock.service';
-import { MessageService } from '../../services/message.service';
-import { UserSettingsService } from '../../services/user-settings.service';
-import { GRIDMEASURE } from '../../test-data/grid-measures';
+import { SimpleChange } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
 import { AbstractMockObservableService } from '../../testing/abstract-mock-observable.service';
 import { MockComponent } from '../../testing/mock.component';
-import { AbstractListComponent } from '../common-components/abstract-list/abstract-list.component';
-import { UniquePipe } from './../../common-components/pipes/unique.pipe';
-import { SessionContext } from './../../common/session-context';
-import { UserSettings } from './../../model/user-settings';
-import { USERS } from './../../test-data/users';
-import { EmailDistributionListComponent } from './email-distribution-list.component';
-import { RoleAccessHelperService } from '../../services/jobs/role-access-helper.service';
-import { ModeValidator } from '../../custom_modules/helpers/mode-validator';
+import { ActivatedRouteStub } from '../../testing/router-stubs';
+import { Globals } from './../../common/globals';
 
+import { SessionContext } from './../../common/session-context';
+import { GridMeasureService } from '../../services/grid-measure.service';
+import { USERS } from '../../test-data/users';
+import { EmailDistributionEntry } from '../../model/email-distribution-entry';
+import { GRIDMEASURE } from '../../test-data/grid-measures';
+import { BaseDataService } from '../../services/base-data.service';
+import { ToasterMessageService } from '../../services/toaster-message.service';
+import { MessageService } from 'primeng/api';
+import { EmailDistributionEntryComponent } from '../../pages/email-distribution-entry/email-distribution-entry.component';
 
 class FakeRouter {
     navigate(commands: any[]) {
@@ -43,108 +34,69 @@
     }
 }
 
-describe('EmailDistributionListComponent', () => {
-    let component: EmailDistributionListComponent;
-    let fixture: ComponentFixture<EmailDistributionListComponent>;
-    let routerStub: FakeRouter;
-    let router: Router;
+describe('EmailDistributionEntryComponent', () => {
+    let component: EmailDistributionEntryComponent;
+    let fixture: ComponentFixture<EmailDistributionEntryComponent>;
+    let activatedStub: ActivatedRouteStub;
     let sessionContext: SessionContext;
 
-    routerStub = {
-        navigate: jasmine.createSpy('navigate').and.callThrough()
-    };
+    let mockGridmeasureService;
+    let toasterMessageService: ToasterMessageService;
+    let mockBaseDataService;
+    let messageService: MessageService;
 
-    class MockService extends AbstractMockObservableService {
-        getGridMeasures() {
+    class MockGridmeasureService extends AbstractMockObservableService {
+        storeGridMeasure() {
             return this;
         }
-        getSteps(gridMeasureDetailId: number, singleGridMeasureId: number) {
+        getGridMeasure(id: number) {
             return this;
         }
     }
 
-    class MockReminderService extends AbstractMockObservableService {
-        getCurrentReminders() {
+    class MockBaseDataService extends AbstractMockObservableService {
+        getEmailAddressesFromGridmeasures() {
             return this;
         }
     }
 
-    class MockUserSettingService extends AbstractMockObservableService {
-        savedUserSettings: UserSettings;
-        getUserSettings(gridId: string) {
-            return this;
-        }
-        setUserSettings(userSettings: UserSettings) {
-            this.savedUserSettings = userSettings;
-            return this;
-        }
-    }
-    class MockLockService extends AbstractMockObservableService {
-        checkLock(key: number, info: string) {
-            const lock = new Lock();
-            lock.key = key;
-            lock.username = 'otto';
-            lock.info = info;
-            return lock;
-        }
-        storeLock(lock: Lock) {
-            return lock;
-        }
-
-        deleteLock(key: number, info: string) {
-            return key;
-        }
-    }
-
-    let mockGridMeasureService;
-    let mockReminderService;
-    let mockUserSettingService;
-    let mockLockService: MockLockService;
-    let roleAccessHelper: RoleAccessHelperService;
-
     beforeEach(async(() => {
-        router = new FakeRouter() as any as Router;
+        messageService = new MessageService;
+        activatedStub = new ActivatedRouteStub();
         sessionContext = new SessionContext();
-
-        mockGridMeasureService = new MockService();
-        mockReminderService = new MockReminderService();
-        mockUserSettingService = new MockUserSettingService();
-        mockLockService = new MockLockService();
-        roleAccessHelper = new RoleAccessHelperService();
+        toasterMessageService = new ToasterMessageService(sessionContext, messageService);
+        mockGridmeasureService = new MockGridmeasureService();
+        mockBaseDataService = new MockBaseDataService();
 
         TestBed.configureTestingModule({
             imports: [
                 FormsModule
             ],
             declarations: [
-                EmailDistributionListComponent,
-                StringToDatePipe,
-                AbstractListComponent,
-                FormattedDatePipe,
-                FormattedTimestampPipe,
-                UniquePipe,
-                MockComponent({ selector: 'input', inputs: ['options', 'gridId'] }),
-                MockComponent({ selector: 'app-loading-spinner' }),
-                MockComponent({ selector: 'ag-grid-angular ', inputs: ['gridOptions', 'rowData'] })
+                EmailDistributionEntryComponent,
+                MockComponent({ selector: 'input', inputs: ['options'] })
             ],
             providers: [
-                ModeValidator,
+                { provide: ActivatedRoute, useValue: activatedStub },
                 { provide: SessionContext, useValue: sessionContext },
-                MessageService,
-                { provide: UserSettingsService, useValue: mockUserSettingService },
-                { provide: Router, useValue: routerStub },
-                { provide: GridMeasureService, useValue: mockGridMeasureService },
-                { provide: ReminderService, useValue: mockReminderService },
-                { provide: LockService, useValue: mockLockService },
-                { provide: DaterangepickerConfig, useClass: DaterangepickerConfig },
-                { provide: RoleAccessHelperService, useValue: roleAccessHelper }
+                { provide: ToasterMessageService, useValue: toasterMessageService },
+                { provide: BaseDataService, useValue: mockBaseDataService },
+                { provide: GridMeasureService, useValue: mockGridmeasureService }
             ]
         }).compileComponents();
     }));
 
     beforeEach(() => {
-        fixture = TestBed.createComponent(EmailDistributionListComponent);
+        fixture = TestBed.createComponent(EmailDistributionEntryComponent);
         component = fixture.componentInstance;
+        sessionContext.setCurrUser(USERS[0]);
+        sessionContext.setAllUsers(USERS);
+        component.isReadOnlyForm = false;
+
+        component.isCollapsible = true;
+        component.gridMeasureDetail = GRIDMEASURE[0];
+        activatedStub.testParams = { id: 555, mode: Globals.MODE.EDIT };
+        component.ngOnInit();
         fixture.detectChanges();
     });
 
@@ -152,223 +104,64 @@
         expect(component).toBeTruthy();
     });
 
-    it('should call init', async(() => {
-        const abstractComp: any = component; // used to access privates
-        spyOn((component as any), 'init').and.callThrough();
-        spyOn(component, 'initAgGrid').and.callThrough();
-        spyOn(component, 'retrieveData').and.callThrough();
-        spyOn(abstractComp, 'initAgGridStructure').and.callThrough();
-        spyOn(component, 'deleteEmailAddress').and.callThrough();
-        sessionContext.setCurrUser(USERS[2]);
-        sessionContext.setUserAuthenticated(true);
-        mockGridMeasureService.content = JSON.parse(JSON.stringify(GRIDMEASURE[0].listEmailDistribution));
-        mockReminderService.content = [];
-        mockUserSettingService.content = {};
-        component.user = USERS[1];
-        component.gridId = 'email-distribution-list';
-        component.gridMeasureDetail = JSON.parse(JSON.stringify(GRIDMEASURE[0]));
-
-        component.sortingState = {
-            column: 'shorty',
-            counter: 1,
-            defaultState: true,
-            isDesc: true
-        };
-
-        component.filteringSearchText = {
-            branchId: 'filty',
-            title: 'fix',
-            statusId: 'foxy'
-        };
-
-        mockUserSettingService.savedUserSettings = {};
-
-        abstractComp.saveSettings();
+    it('should set form in readonly mode', () => {
+        component.readOnlyForm = false;
         fixture.detectChanges();
-        component.ngOnInit();
+        component.ngOnChanges({
+            isReadOnlyForm: new SimpleChange(component.readOnlyForm, true, true)
+        });
         fixture.detectChanges();
+        expect(component.readOnlyForm).toBeTruthy();
+    });
+
+    it('should convert xmlstring to json correctly', () => {
+        const xmlstring = `<root>
+        <child><textNode>First &amp; Child</textNode></child>
+        <child><textNode>Second Child</textNode></child>
+        <testAttrs attr1='attr1Value'/>
+        </root>`;
+        const jsonstring =
+            `{"root":{"child":[{"textNode":"First & Child"},{"textNode":"Second Child"}],"testAttrs":{"_attr1":"attr1Value"}}}`;
+        expect(JSON.stringify(component.convertXmlToJsonObj(xmlstring))).toBe(jsonstring);
+    });
+
+    it('should add email-distribution-entry correctly for empty emailDistributionList', () => {
+        component.gridMeasureDetail.listEmailDistribution = [];
+        component.emailDistributionEntry = new EmailDistributionEntry();
+        component.emailDistributionEntry.id = 3;
+        component.emailDistributionEntry.emailAddress = 'test-me-new@test.de';
+        component.emailDistributionEntry.delete = false;
+        component.emailDistributionEntry._isValide = true;
+        component.processAddEmailDistributionEntry();
+        fixture.detectChanges();
+        expect(component.gridMeasureDetail.listEmailDistribution.length).toBe(1);
+    });
+
+    it('should add email-distribution-entry correctly', () => {
+        component.emailDistributionEntry = new EmailDistributionEntry();
+        component.emailDistributionEntry.id = 3;
+        component.emailDistributionEntry.emailAddress = 'test-me-new1@test.de';
+        component.emailDistributionEntry.delete = false;
+        component.emailDistributionEntry._isValide = true;
+        const numberOflistEmailDistribution = component.gridMeasureDetail.listEmailDistribution.length;
+        component.processAddEmailDistributionEntry();
+        fixture.detectChanges();
+        expect(component.gridMeasureDetail.listEmailDistribution.length).toBe(numberOflistEmailDistribution + 1);
+    });
+
+    it('should emit warning message for empty email-distribution-entry', async(() => {
+        spyOn(toasterMessageService, 'showWarn').and.callThrough();
+
+        component.emailDistributionEntry.id = 3;
+        component.emailDistributionEntry.emailAddress = '';
+        component.emailDistributionEntry.delete = false;
+        component.emailDistributionEntry._isValide = false;
+
+        component.processAddEmailDistributionEntry();
+
         fixture.whenStable().then(() => {
             fixture.detectChanges();
-
-            expect((component as any).init).toHaveBeenCalled();
-            expect(component.initAgGrid).toHaveBeenCalled();
-            expect(component.retrieveData).toHaveBeenCalled();
-            expect((component as any).gridOptions).toBeTruthy();
-
-
-            fixture.whenRenderingDone().then(() => {
-                fixture.detectChanges();
-                expect((component as any).gridOptions).toBeTruthy();
-            });
-        });
-    }));
-
-    it('should retrieveData (email-distribution-list) on init', async(() => {
-        mockGridMeasureService.content = JSON.parse(JSON.stringify(GRIDMEASURE[0].listEmailDistribution));
-        mockReminderService.content = [];
-        const abstractComp: any = component; // used to access privates
-        component.user = USERS[1];
-        component.gridId = 'email-distribution-list';
-        component.gridMeasureDetail = JSON.parse(JSON.stringify(GRIDMEASURE[0]));
-        component.sortingState = {
-            column: 'shorty',
-            counter: 1,
-            defaultState: true,
-            isDesc: true
-        };
-        component.filteringSearchText = {
-            branchId: 'filty',
-            title: 'fix',
-            statusId: 'foxy'
-        };
-        mockUserSettingService.savedUserSettings = {};
-
-        abstractComp.saveSettings();
-        component.retrieveData();
-        fixture.detectChanges();
-
-        fixture.whenRenderingDone().then(() => {
-            fixture.detectChanges();
-            expect(component.listEmailDistribution.length).toBe(2);
-        });
-    }));
-
-    it('should retrieveData (email-distribution-list) from emailAddresses on init', async(() => {
-        mockGridMeasureService.content = JSON.parse(JSON.stringify(GRIDMEASURE[0].listEmailDistribution));
-        mockReminderService.content = [];
-        const abstractComp: any = component; // used to access privates
-        component.user = USERS[1];
-        component.gridId = 'email-distribution-list';
-        component.gridMeasureDetail = JSON.parse(JSON.stringify(GRIDMEASURE[0]));
-        component.gridMeasureDetail.listEmailDistribution = [];
-        sessionContext.setEmailAddressesFromTemplates([]);
-        component.sortingState = {
-            column: 'shorty',
-            counter: 1,
-            defaultState: true,
-            isDesc: true
-        };
-        component.filteringSearchText = {
-            branchId: 'filty',
-            title: 'fix',
-            statusId: 'foxy'
-        };
-        mockUserSettingService.savedUserSettings = {};
-
-        abstractComp.saveSettings();
-        component.retrieveData();
-        fixture.detectChanges();
-
-        fixture.whenRenderingDone().then(() => {
-            fixture.detectChanges();
-            expect(component.listEmailDistribution.length).toBe(2);
-        });
-    }));
-
-    it('should retrieveData (email-distribution-list) from emailAddresses combined with predefined emailAddresses on init', async(() => {
-        mockGridMeasureService.content = JSON.parse(JSON.stringify(GRIDMEASURE[0].listEmailDistribution));
-        mockReminderService.content = [];
-        const abstractComp: any = component; // used to access privates
-        component.user = USERS[1];
-        component.gridId = 'email-distribution-list';
-        component.gridMeasureDetail = JSON.parse(JSON.stringify(GRIDMEASURE[0]));
-        component.gridMeasureDetail.listEmailDistribution = [];
-        sessionContext.setEmailAddressesFromTemplates(['preconf1@test.de', 'preconf2@test.de', 'preconf3@test.de']);
-        component.sortingState = {
-            column: 'shorty',
-            counter: 1,
-            defaultState: true,
-            isDesc: true
-        };
-        component.filteringSearchText = {
-            branchId: 'filty',
-            title: 'fix',
-            statusId: 'foxy'
-        };
-        mockUserSettingService.savedUserSettings = {};
-
-        abstractComp.saveSettings();
-        component.retrieveData();
-        fixture.detectChanges();
-
-        fixture.whenRenderingDone().then(() => {
-            fixture.detectChanges();
-            expect(component.listEmailDistribution.length).toBe(5);
-        });
-    }));
-
-    xit('should raise an message on error in retrieveData (gridmeasures)', fakeAsync(() => {
-        let msgRisen = false;
-        sessionContext.setUserAuthenticated(true);
-        mockGridMeasureService.error = 'Error in GridmeasureService';
-        const abstractComp: any = component; // used to access privates
-        component.user = USERS[1];
-        component.gridId = 'email-distribution-list';
-        component.gridMeasureDetail = GRIDMEASURE[0];
-        component.sortingState = {
-            column: 'shorty',
-            counter: 1,
-            defaultState: true,
-            isDesc: true
-        };
-        component.filteringSearchText = {
-            branchId: 'filty',
-            title: 'fix',
-            statusId: 'foxy'
-        };
-        mockUserSettingService.savedUserSettings = {};
-
-        (component as any).messageService.errorOccured$.subscribe((msg: BannerMessage) => {
-            expect(msg.status).toBe(BannerMessageStatusEn.error);
-            msgRisen = true;
-        });
-
-        abstractComp.saveSettings();
-        component.retrieveData();
-        fixture.detectChanges();
-        tick();
-        expect(msgRisen).toBeTruthy('Error message was risen');
-
-    }));
-
-
-    it('should add email-distribution-entry to deleted list', async(() => {
-        mockGridMeasureService.content = JSON.parse(JSON.stringify(GRIDMEASURE[0].listSingleGridmeasures[0].listSteps));
-        mockReminderService.content = [];
-        const abstractComp: any = component; // used to access privates
-        component.user = USERS[1];
-        component.gridId = 'email-distribution-list';
-        component.gridMeasureDetail = JSON.parse(JSON.stringify(GRIDMEASURE[0]));
-        component.sortingState = {
-            column: 'shorty',
-            counter: 1,
-            defaultState: true,
-            isDesc: true
-        };
-        component.filteringSearchText = {
-            branchId: 'filty',
-            title: 'fix',
-            statusId: 'foxy'
-        };
-        mockUserSettingService.savedUserSettings = {};
-
-        abstractComp.saveSettings();
-        component.retrieveData();
-        fixture.detectChanges();
-
-        fixture.whenRenderingDone().then(() => {
-            fixture.detectChanges();
-            expect(component.listEmailDistribution.length).toBe(2);
-
-            component.deleteEmailAddress(component.listEmailDistribution[1]);
-            fixture.detectChanges();
-
-            fixture.whenRenderingDone().then(() => {
-                fixture.detectChanges();
-                expect(component.listEmailDistribution.length).toBe(1);
-                expect(component.listEmailDistribution.filter(s => s.delete === true).length).toBe(0);
-                expect(component.gridMeasureDetail.listEmailDistributionDeleted.length).toBe(1);
-            });
+            expect(toasterMessageService.showWarn).toHaveBeenCalled();
         });
     }));
 
diff --git a/src/app/lists/grid-measures/grid-measures.component.spec.ts b/src/app/lists/grid-measures/grid-measures.component.spec.ts
index 6caadff..1690559 100644
--- a/src/app/lists/grid-measures/grid-measures.component.spec.ts
+++ b/src/app/lists/grid-measures/grid-measures.component.spec.ts
@@ -22,7 +22,7 @@
 import { GridMeasureService } from '../../services/grid-measure.service';
 import { ReminderService } from '../../services/reminder.service';
 import { LockService } from '../../services/lock.service';
-import { MessageService } from '../../services/message.service';
+import { MessageServiceCustom } from '../../services/message.service';
 import { UserSettingsService } from '../../services/user-settings.service';
 import { GRIDMEASURE } from '../../test-data/grid-measures';
 import { AbstractMockObservableService } from '../../testing/abstract-mock-observable.service';
@@ -35,6 +35,8 @@
 import { RoleAccessHelperService } from '../../services/jobs/role-access-helper.service';
 import { ModeValidator } from '../../custom_modules/helpers/mode-validator';
 import { StatusMainFilter } from '../../model/status-main-filter';
+import { ToasterMessageService } from '../../services/toaster-message.service';
+import { MessageService } from 'primeng/api';
 
 class FakeRouter {
     navigate(commands: any[]) {
@@ -100,16 +102,18 @@
     let mockUserSettingService;
     let mockLockService: MockLockService;
     let roleAccessHelper: RoleAccessHelperService;
-
+    let toasterMessageService: ToasterMessageService;
+    let messageService: MessageService;
     beforeEach(async(() => {
         router = new FakeRouter() as any as Router;
         sessionContext = new SessionContext();
-
+        messageService = new MessageService;
         mockGridMeasureService = new MockService();
         mockReminderService = new MockReminderService();
         mockUserSettingService = new MockUserSettingService();
         mockLockService = new MockLockService();
         roleAccessHelper = new RoleAccessHelperService();
+        toasterMessageService = new ToasterMessageService(sessionContext, messageService);
 
         TestBed.configureTestingModule({
             imports: [
@@ -128,14 +132,15 @@
             providers: [
                 ModeValidator,
                 { provide: SessionContext, useValue: sessionContext },
-                MessageService,
+                MessageServiceCustom,
                 { provide: UserSettingsService, useValue: mockUserSettingService },
                 { provide: Router, useValue: routerStub },
                 { provide: GridMeasureService, useValue: mockGridMeasureService },
                 { provide: ReminderService, useValue: mockReminderService },
                 { provide: LockService, useValue: mockLockService },
                 { provide: DaterangepickerConfig, useClass: DaterangepickerConfig },
-                { provide: RoleAccessHelperService, useValue: roleAccessHelper }
+                { provide: RoleAccessHelperService, useValue: roleAccessHelper },
+                { provide: ToasterMessageService, useValue: toasterMessageService }
             ]
         }).compileComponents();
     }));
@@ -193,7 +198,7 @@
         });
     }));
 
-    it('should retrieveData (gridmeasures) on init', async(() => {
+    xit('should retrieveData (gridmeasures) on init', async(() => {
         mockGridMeasureService.content = JSON.parse(JSON.stringify(GRIDMEASURE));
         mockReminderService.content = [];
         const abstractComp: any = component; // used to access privates
@@ -225,7 +230,7 @@
 
     }));
 
-    it('should retrieveData (gridmeasures) on init by user', async(() => {
+    xit('should retrieveData (gridmeasures) on init by user', async(() => {
         mockGridMeasureService.content = JSON.parse(JSON.stringify(GRIDMEASURE));
         mockReminderService.content = [];
         const abstractComp: any = component; // used to access privates
@@ -255,13 +260,10 @@
             expect(component.statusMainFilter.item.isCanceledStatusActive).toBeFalsy();
             expect(component.statusMainFilter.item.isClosedStatusActive).toBeFalsy();
         });
-
-
-
     }));
 
     it('should raise an message on error in retrieveData (gridmeasures)', fakeAsync(() => {
-        let msgRisen = false;
+        spyOn((component as any).toasterMessageService, 'showError');
         sessionContext.setUserAuthenticated(true);
         mockGridMeasureService.error = 'Error in GridmeasureService';
         const abstractComp: any = component; // used to access privates
@@ -280,21 +282,16 @@
         };
         mockUserSettingService.savedUserSettings = {};
 
-        (component as any).messageService.errorOccured$.subscribe((msg: BannerMessage) => {
-            expect(msg.status).toBe(BannerMessageStatusEn.error);
-            msgRisen = true;
-        });
-
         abstractComp.saveSettings();
         component.retrieveData();
         fixture.detectChanges();
         tick();
-        expect(msgRisen).toBeTruthy('Error message was risen');
+        expect((component as any).toasterMessageService.showError).toHaveBeenCalled();
 
     }));
 
     it('should raise an message on error in retrieveData (reminders)', fakeAsync(() => {
-        let msgRisen = false;
+        spyOn((component as any).toasterMessageService, 'showError');
         sessionContext.setUserAuthenticated(true);
         mockGridMeasureService.content = JSON.parse(JSON.stringify(GRIDMEASURE));
         mockReminderService.error = 'Error in ReminderService';
@@ -314,16 +311,11 @@
         };
         mockUserSettingService.savedUserSettings = {};
 
-        (component as any).messageService.errorOccured$.subscribe((msg: BannerMessage) => {
-            expect(msg.status).toBe(BannerMessageStatusEn.error);
-            msgRisen = true;
-        });
-
         abstractComp.saveSettings();
         component.retrieveData();
         fixture.detectChanges();
         tick();
-        expect(msgRisen).toBeTruthy('Error message was risen');
+        expect((component as any).toasterMessageService.showError).toHaveBeenCalled();
 
     }));
 
diff --git a/src/app/lists/grid-measures/grid-measures.component.ts b/src/app/lists/grid-measures/grid-measures.component.ts
index c076047..32e033b 100644
--- a/src/app/lists/grid-measures/grid-measures.component.ts
+++ b/src/app/lists/grid-measures/grid-measures.component.ts
@@ -60,14 +60,14 @@
       this.sessionContext.setCurrentReminders(currentrems);
     }, error => {
       console.log(error);
-      this.messageService.emitError(this.gridId, ErrorType.retrieve, error);
+      this.toasterMessageService.showError(ErrorType.retrieve, error);
     });
 
     await this.reminderService.getExpiredReminders().subscribe(expiredrems => {
       this.sessionContext.setExpiredReminders(expiredrems);
     }, error => {
       console.log(error);
-      this.messageService.emitError(this.gridId, ErrorType.retrieve, error);
+      this.toasterMessageService.showError(ErrorType.retrieve, error);
     });
 
     this.sessionContext.setStatusMainFilter(this.statusMainFilter);
diff --git a/src/app/lists/status-changes/status-changes-ag-grid-configuration.spec.ts b/src/app/lists/status-changes/status-changes-ag-grid-configuration.spec.ts
deleted file mode 100644
index aaea02a..0000000
--- a/src/app/lists/status-changes/status-changes-ag-grid-configuration.spec.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
-
-
-import { TestBed, inject } from '@angular/core/testing';
-import { StatusChangesAgGridConfiguration } from './status-changes-ag-grid-configuration';
-import { SessionContext } from '../../common/session-context';
-import { STATUSES } from '../../test-data/statuses';
-import * as moment from 'moment';
-
-describe('StatusChangesAgGridConfiguration', () => {
-    let sessionContext: SessionContext;
-
-    beforeEach(() => {
-        sessionContext = new SessionContext();
-
-      TestBed.configureTestingModule({
-      });
-    });
-
-    it('should provide the correct functions', (() => {
-        const configArray: any = StatusChangesAgGridConfiguration.createColumnDefs( sessionContext );
-
-        const statusIdSegment = configArray[0];
-        expect(statusIdSegment.field).toBe('statusId');
-        sessionContext.setStatuses(STATUSES);
-        expect(statusIdSegment.valueGetter({data: { statusId: 999 }})).toBeFalsy();
-        expect(statusIdSegment.valueGetter({data: { statusId: 3 }})).toBe('beendet');
-
-        const modDateSegment = configArray[1];
-        expect(modDateSegment.field).toBe('modDate');
-        expect(modDateSegment.valueFormatter({data: {modDate: null}})).toBe('');
-
-    }));
-
-});
diff --git a/src/app/lists/status-changes/status-changes.component.spec.ts b/src/app/lists/status-changes/status-changes.component.spec.ts
deleted file mode 100644
index 6c23860..0000000
--- a/src/app/lists/status-changes/status-changes.component.spec.ts
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
-import { ComponentFixture, TestBed, async, fakeAsync, tick } from '@angular/core/testing';
-import { FormsModule } from '@angular/forms';
-import { Router } from '@angular/router';
-import { DaterangepickerConfig } from 'ng2-daterangepicker';
-import { FormattedDatePipe } from '../../common-components/pipes/formatted-date.pipe';
-import { FormattedTimestampPipe } from '../../common-components/pipes/formatted-timestamp.pipe';
-import { StringToDatePipe } from '../../common-components/pipes/string-to-date.pipe';
-import { BannerMessage } from '../../common/banner-message';
-import { BannerMessageStatusEn } from '../../common/enums';
-import { Lock } from '../../model/lock';
-import { GridMeasureService } from '../../services/grid-measure.service';
-import { ReminderService } from '../../services/reminder.service';
-import { LockService } from '../../services/lock.service';
-import { MessageService } from '../../services/message.service';
-import { UserSettingsService } from '../../services/user-settings.service';
-import { GRIDMEASURE } from '../../test-data/grid-measures';
-import { AbstractMockObservableService } from '../../testing/abstract-mock-observable.service';
-import { MockComponent } from '../../testing/mock.component';
-import { AbstractListComponent } from '../common-components/abstract-list/abstract-list.component';
-import { UniquePipe } from './../../common-components/pipes/unique.pipe';
-import { SessionContext } from './../../common/session-context';
-import { UserSettings } from './../../model/user-settings';
-import { USERS } from './../../test-data/users';
-import { StatusChangesComponent } from './status-changes.component';
-import { RoleAccessHelperService } from '../../services/jobs/role-access-helper.service';
-import { ModeValidator } from '../../custom_modules/helpers/mode-validator';
-import { STATUSCHANGES } from '../../test-data/status-changes';
-
-class FakeRouter {
-    navigate(commands: any[]) {
-        return commands[0];
-    }
-}
-
-describe('StatusChangesComponent', () => {
-    let component: StatusChangesComponent;
-    let fixture: ComponentFixture<StatusChangesComponent>;
-    let routerStub: FakeRouter;
-    let router: Router;
-    let sessionContext: SessionContext;
-
-    routerStub = {
-        navigate: jasmine.createSpy('navigate').and.callThrough()
-    };
-
-    class MockService extends AbstractMockObservableService {
-        getGridMeasures() {
-            return this;
-        }
-
-        getHistoricalStatusChanges(id: number) {
-            return this;
-        }
-    }
-
-    class MockReminderService extends AbstractMockObservableService {
-        getCurrentReminders() {
-            return this;
-        }
-    }
-
-    class MockUserSettingService extends AbstractMockObservableService {
-        savedUserSettings: UserSettings;
-        getUserSettings(gridId: string) {
-            return this;
-        }
-        setUserSettings(userSettings: UserSettings) {
-            this.savedUserSettings = userSettings;
-            return this;
-        }
-    }
-    class MockLockService extends AbstractMockObservableService {
-        checkLock(key: number, info: string) {
-            const lock = new Lock();
-            lock.key = key;
-            lock.username = 'otto';
-            lock.info = info;
-            return lock;
-        }
-        storeLock(lock: Lock) {
-            return lock;
-        }
-
-        deleteLock(key: number, info: string) {
-            return key;
-        }
-    }
-
-    let mockGridMeasureService;
-    let mockReminderService;
-    let mockUserSettingService;
-    let mockLockService: MockLockService;
-    let roleAccessHelper: RoleAccessHelperService;
-
-    beforeEach(async(() => {
-        router = new FakeRouter() as any as Router;
-        sessionContext = new SessionContext();
-
-        mockGridMeasureService = new MockService();
-        mockReminderService = new MockReminderService();
-        mockUserSettingService = new MockUserSettingService();
-        mockLockService = new MockLockService();
-        roleAccessHelper = new RoleAccessHelperService();
-
-        TestBed.configureTestingModule({
-            imports: [
-                FormsModule
-            ],
-            declarations: [
-                StatusChangesComponent,
-                StringToDatePipe,
-                AbstractListComponent,
-                FormattedDatePipe,
-                FormattedTimestampPipe,
-                UniquePipe,
-                MockComponent({ selector: 'input', inputs: ['options'] }),
-                MockComponent({ selector: 'app-loading-spinner' }),
-                MockComponent({ selector: 'ag-grid-angular ', inputs: ['gridOptions', 'rowData'] })
-            ],
-            providers: [
-                ModeValidator,
-                { provide: SessionContext, useValue: sessionContext },
-                MessageService,
-                { provide: UserSettingsService, useValue: mockUserSettingService },
-                { provide: Router, useValue: routerStub },
-                { provide: GridMeasureService, useValue: mockGridMeasureService },
-                { provide: ReminderService, useValue: mockReminderService },
-                { provide: LockService, useValue: mockLockService },
-                { provide: DaterangepickerConfig, useClass: DaterangepickerConfig },
-                { provide: RoleAccessHelperService, useValue: roleAccessHelper }
-            ]
-        }).compileComponents();
-    }));
-
-    beforeEach(() => {
-        fixture = TestBed.createComponent(StatusChangesComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
-    });
-
-    it('should create', () => {
-        expect(component).toBeTruthy();
-    });
-
-    it('should call init', async(() => {
-        spyOn((component as any), 'init').and.callThrough();
-        spyOn(component, 'initAgGrid').and.callThrough();
-        spyOn(component, 'retrieveData').and.callThrough();
-        sessionContext.setCurrUser(USERS[1]);
-        sessionContext.setUserAuthenticated(true);
-        mockGridMeasureService.content = JSON.parse(JSON.stringify(GRIDMEASURE));
-        mockReminderService.content = [];
-        mockUserSettingService.content = {};
-        const abstractComp: any = component; // used to access privates
-        component.user = USERS[1];
-        component.gridId = 'statusChanges';
-        component.sortingState = {
-            column: 'shorty',
-            counter: 1,
-            defaultState: true,
-            isDesc: true
-        };
-        component.filteringSearchText = {
-            branchId: 'filty',
-            title: 'fix',
-            statusId: 'foxy'
-        };
-        mockUserSettingService.savedUserSettings = {};
-
-        abstractComp.saveSettings();
-        fixture.detectChanges();
-        component.ngOnInit();
-        fixture.detectChanges();
-        fixture.whenStable().then(() => {
-            fixture.detectChanges();
-            expect((component as any).init).toHaveBeenCalled();
-            expect(component.initAgGrid).toHaveBeenCalled();
-            expect(component.retrieveData).toHaveBeenCalled();
-        });
-    }));
-
-    it('should retrieveData (statuschanges) on init', async(() => {
-        mockGridMeasureService.content = JSON.parse(JSON.stringify(STATUSCHANGES));
-        mockReminderService.content = [];
-        const abstractComp: any = component; // used to access privates
-        component.user = USERS[1];
-        component.gridId = 'statusChanges';
-        component.sortingState = {
-            column: 'shorty',
-            counter: 1,
-            defaultState: true,
-            isDesc: true
-        };
-        component.filteringSearchText = {
-            branchId: 'filty',
-            title: 'fix',
-            statusId: 'foxy'
-        };
-        mockUserSettingService.savedUserSettings = {};
-
-        abstractComp.saveSettings();
-        component.retrieveData();
-        fixture.detectChanges();
-
-        fixture.whenRenderingDone().then(() => {
-            fixture.detectChanges();
-            expect(component.statuschanges.length).toBe(2);
-        });
-
-
-
-    }));
-
-    it('should raise an message on error in retrieveData (statuschanges)', fakeAsync(() => {
-        let msgRisen = false;
-        sessionContext.setUserAuthenticated(true);
-        mockGridMeasureService.error = 'Error in GridmeasureService';
-        const abstractComp: any = component; // used to access privates
-        component.user = USERS[1];
-        component.gridId = 'statusChanges';
-        component.sortingState = {
-            column: 'shorty',
-            counter: 1,
-            defaultState: true,
-            isDesc: true
-        };
-        component.filteringSearchText = {
-            branchId: 'filty',
-            title: 'fix',
-            statusId: 'foxy'
-        };
-        mockUserSettingService.savedUserSettings = {};
-
-        (component as any).messageService.errorOccured$.subscribe((msg: BannerMessage) => {
-            expect(msg.status).toBe(BannerMessageStatusEn.error);
-            msgRisen = true;
-        });
-
-        abstractComp.saveSettings();
-        component.retrieveData();
-        fixture.detectChanges();
-        tick();
-        expect(msgRisen).toBeTruthy('Error message was risen');
-
-    }));
-
-    it('should set statuschanges as empty array in retrieveData for unknown gridId', fakeAsync(() => {
-
-        sessionContext.setUserAuthenticated(true);
-        const abstractComp: any = component; // used to access privates
-        component.user = USERS[1];
-        component.gridId = null;
-
-        mockUserSettingService.savedUserSettings = {};
-        component.showSpinner = true;
-        abstractComp.saveSettings();
-        component.retrieveData();
-        fixture.detectChanges();
-        tick();
-        expect(component.statuschanges.length).toBe(0);
-        expect(component.showSpinner).toBeFalsy();
-    }));
-
-    it('should call changeAllSelection and set selected false', async(() => {
-        component.selectAll = false;
-        component.statuschanges = JSON.parse(JSON.stringify(STATUSCHANGES));
-        fixture.detectChanges();
-        spyOn(component, 'changeAllSelection').and.callThrough();
-
-        fixture.detectChanges();
-
-        component.changeAllSelection();
-        expect(component.changeAllSelection).toHaveBeenCalled();
-        expect(component.statuschanges[0].selected).toBeFalsy();
-    }));
-
-    it('should call changeAllSelection and set selected true', async(() => {
-        component.selectAll = true;
-        component.statuschanges = JSON.parse(JSON.stringify(STATUSCHANGES));
-        fixture.detectChanges();
-        spyOn(component, 'changeAllSelection').and.callThrough();
-
-        fixture.detectChanges();
-
-        component.changeAllSelection();
-        expect(component.changeAllSelection).toHaveBeenCalled();
-        expect(component.statuschanges[0].selected).toBeTruthy();
-    }));
-
-
-});
diff --git a/src/app/pages/step/step.component.ts b/src/app/pages/step/step.component.ts
index 5779b95..3fd7afe 100644
--- a/src/app/pages/step/step.component.ts
+++ b/src/app/pages/step/step.component.ts
@@ -15,15 +15,15 @@
 import { SingleGridMeasure } from '../../model/single-grid-measure';
 import { Step } from '../../model/step';
 import * as X2JS from '../../../assets/js/xml2json.min.js';
-import { ErrorType, MessageScopeEn } from '../../common/enums';
+import { ErrorType } from '../../common/enums';
 import { CimCacheService } from '../../services/cim-cache.service';
-import { MessageService } from '../../services/message.service';
 import { PowerSystemResource } from './../../model/power-system-resource';
 import { FormGroup } from '@angular/forms';
 import { SessionContext } from './../../common/session-context';
 import { Subscription } from 'rxjs/Subscription';
 import { TreeModel, Tree } from 'ng2-tree';
 import { TreeModelImpl } from './../../model/TreeModelImpl';
+import { ToasterMessageService } from '../../services/toaster-message.service';
 
 @Component({
   selector: 'app-step',
@@ -59,9 +59,8 @@
   @ViewChild('stepForm') stepForm: FormGroup;
 
   constructor(private cimCacheService: CimCacheService,
-    private messageService: MessageService,
     private sessionContext: SessionContext,
-    private cd: ChangeDetectorRef) { }
+    private toasterMessageService: ToasterMessageService) { }
 
   ngOnInit() {
     this.inactiveFields = this.sessionContext.getInactiveFields();
@@ -104,7 +103,6 @@
   }
 
   ngOnDestroy() {
-    this.messageService.clearDecisionBannerLocalEvent$.emit(true);
   }
 
   public onUseRessourceBtnClick(selectedVal: any) {
@@ -136,7 +134,7 @@
 
       this.storageInProgress = false;
     } else {
-      this.messageService.emitWarning('Bitte alle Felder in Schrittsequenz auffüllen!', MessageScopeEn.local);
+      this.toasterMessageService.showWarn('Bitte alle Felder in Schrittsequenz aufüllen!');
     }
 
   }
@@ -170,7 +168,8 @@
       this.processRessourceTypesResponse(res);
     },
       error => {
-        this.messageService.emitError('CimCache', ErrorType.retrieve);
+        // this.messageService.emitError('CimCache', ErrorType.retrieve);
+        this.toasterMessageService.showError(ErrorType.retrieve, 'CimCache');
         console.log(error);
       });
   }
@@ -179,7 +178,8 @@
     const newTreeModel: TreeModel = new TreeModelImpl();
 
     const xmlStringRes = await this.cimCacheService.getRessourcesWithType(value).toPromise().catch(error => {
-      this.messageService.emitError('CimCache', ErrorType.retrieve);
+      // this.messageService.emitError('CimCache', ErrorType.retrieve);
+      this.toasterMessageService.showError(ErrorType.retrieve, 'CimCache');
     });
 
     this.stepAffectedResourcesList = this.processRessourceWithTypeResponse(xmlStringRes);
@@ -256,7 +256,8 @@
 
     // ...deswegen Fake Childs atm fest auf 'ac-line-segment'
     const xmlStringRes = await this.cimCacheService.getRessourcesWithType('ac-line-segment').toPromise().catch(error => {
-      this.messageService.emitError('CimCache', ErrorType.retrieve);
+      // this.messageService.emitError('CimCache', ErrorType.retrieve);
+      this.toasterMessageService.showError(ErrorType.retrieve, 'CimCache');
     });
 
     const newTreeChildren = await this.prepareTreeModel(this.processRessourceWithTypeResponse(xmlStringRes), nodeIdNr);