diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts
index 8669c8dc7..0cece1565 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts
@@ -55,13 +55,13 @@ export class DatasetProfileCriteriaComponent extends BaseCriteriaComponent imple
 				message: this.language.instant('DATASET-WIZARD.UPLOAD.UPLOAD-XML-FILE-TITLE'),
 				confirmButton: this.language.instant('DATASET-WIZARD.UPLOAD.UPLOAD-XML'),
 				cancelButton: this.language.instant('DATASET-WIZARD.UPLOAD.UPLOAD-XML-FILE-CANCEL'),
-				name: this.language.instant('DATASET-WIZARD.UPLOAD.UPLOAD-XML-NAME'),
+				name: "",
 				file: FileList,
 				sucsess: false
 			}
 		});
 		dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(data => {
-			if (data.sucsess && data.name != null && data.file != null) {
+			if (data && data.sucsess && data.name != null && data.file != null) {
 				this.datasetService.uploadFile(data.file, data.name)
 					.pipe(takeUntil(this._destroyed))
 					.subscribe();
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html
index 8fdc3b09d..d7747c805 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html
@@ -1,23 +1,25 @@
 <div class="confirmation-dialog">
 	<div class="row">
 		<div class="confirmation-message col align-self-center">
-		<h4>{{ data.message }}</h4>
+			<h4>{{ data.message }}</h4>
 		</div>
 		<div class="col-auto">
 			<input class="hidden" type="file" #imgFileInput (change)="selectXML($event)" accept="text/xml" />
-			<button mat-raised-button class="col-auto" color="{{btnColore}}" (click)="imgFileInput.click()"
-				type="button"><mat-icon>attach_file</mat-icon></button>
+			<button mat-icon-button class="col-auto"  (click)="imgFileInput.click()" type="button">
+				<mat-icon color="{{btnColore}}">attach_file</mat-icon>
+			</button>
 		</div>
 	</div>
 	<div class="row">
 		<mat-form-field class="col-12">
-			<input matInput placeholder="{{'DATASET-WIZARD.UPLOAD.UPLOAD-XML-NAME'| translate}}"
-				name="datasetProfileName" [(ngModel)]="data.name">
+			<input matInput placeholder="{{'DATASET-WIZARD.UPLOAD.UPLOAD-XML-NAME'| translate}}" name="datasetProfileName" [(ngModel)]="data.name">
 		</mat-form-field>
-		<div class="col-auto"><button mat-raised-button color="primary" type="button"
-				(click)="cancel()">{{ data.cancelButton }}</button></div>
+		<div class="col-auto">
+			<button mat-raised-button color="primary" type="button" (click)="cancel()">{{ data.cancelButton }}</button>
+		</div>
 		<div class="col"></div>
-		<div class="col-auto"><button mat-raised-button color="primary" type="button"
-				(click)="confirm()" [disabled]="!hasProfile()">{{ data.confirmButton }}</button></div>
+		<div class="col-auto">
+			<button mat-raised-button color="primary" type="button" (click)="confirm()" [disabled]="!hasProfile()">{{ data.confirmButton }}</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html
index 24d21c5dc..f5d864091 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html
+++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html
@@ -1,23 +1,25 @@
 <div class="confirmation-dialog">
 	<div class="row">
-		<div class="confirmation-message col">
-		<h4>{{ data.message }}</h4>
+		<div class="confirmation-message col-auto align-self-center">
+			<h4>{{ data.message }}</h4>
 		</div>
 		<div class="col-auto">
 			<input class="hidden" type="file" #imgFileInput (change)="selectXML($event)" accept="text/xml" />
-			<button mat-raised-button class="col-auto" color="{{btnColore}}" (click)="imgFileInput.click()"
-				type="button">{{ 'DMP-PROFILE-LISTING.UPLOAD.UPLOAD-XML-IMPORT' | translate }}</button>
+			<button mat-icon-button class="col-auto" (click)="imgFileInput.click()" type="button">
+				<mat-icon color="{{btnColore}}">attach_file</mat-icon>
+			</button>
 		</div>
 	</div>
 	<div class="row">
 		<mat-form-field class="col-12">
-			<input matInput placeholder="{{'DMP-PROFILE-LISTING.UPLOAD.UPLOAD-XML-NAME'| translate}}"
-				name="datasetProfileName" [(ngModel)]="data.name">
+			<input matInput placeholder="{{'DMP-PROFILE-LISTING.UPLOAD.UPLOAD-XML-NAME'| translate}}" name="datasetProfileName" [(ngModel)]="data.name">
 		</mat-form-field>
-		<div class="col-auto"><button mat-raised-button color="primary" type="button"
-				(click)="cancel()">{{ data.cancelButton }}</button></div>
+		<div class="col-auto">
+			<button mat-raised-button color="primary" type="button" (click)="cancel()">{{ data.cancelButton }}</button>
+		</div>
 		<div class="col"></div>
-		<div class="col-auto"><button mat-raised-button color="primary" type="button"
-				(click)="confirm()" [disabled]="!hasProfile()">{{ data.confirmButton }}</button></div>
+		<div class="col-auto">
+			<button mat-raised-button color="primary" type="button" (click)="confirm()" [disabled]="!hasProfile()">{{ data.confirmButton }}</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts
index 9bb4ec2f2..2e309a1a1 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts
+++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dmp-profile-criteria.component.ts
@@ -59,13 +59,13 @@ export class DmpProfileCriteriaComponent extends BaseCriteriaComponent implement
 				message: this.language.instant('DMP-PROFILE-LISTING.UPLOAD.UPLOAD-XML-FILE-TITLE'),
 				confirmButton: this.language.instant('DMP-PROFILE-LISTING.UPLOAD.UPLOAD-XML'),
 				cancelButton: this.language.instant('DMP-PROFILE-LISTING.UPLOAD.UPLOAD-XML-FILE-CANCEL'),
-				name: this.language.instant('DMP-PROFILE-LISTING.UPLOAD.UPLOAD-XML-NAME'),
+				name: '',
 				file: FileList,
 				sucsess: false
 			}
 		});
 		dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(data => {
-			if (data.sucsess && data.name != null && data.file != null) {
+			if (data && data.sucsess && data.name != null && data.file != null) {
 				this.dmpProfileService.uploadFile(data.file, data.name)
 					.pipe(takeUntil(this._destroyed))
 					.subscribe();
diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.routing.ts b/dmp-frontend/src/app/ui/dashboard/dashboard.routing.ts
index f4172c3a7..8d1fc1e57 100644
--- a/dmp-frontend/src/app/ui/dashboard/dashboard.routing.ts
+++ b/dmp-frontend/src/app/ui/dashboard/dashboard.routing.ts
@@ -5,11 +5,10 @@ import { QuickWizardCreateAdd } from './quick-wizard-create-add/quick-wizard-cre
 
 const routes: Routes = [
 	{ path: '', component: DashboardComponent },
-	{ path: 'create-add', component: QuickWizardCreateAdd }
 ];
 
 @NgModule({
 	imports: [RouterModule.forChild(routes)],
 	exports: [RouterModule]
 })
-export class DashboardRoutingModule { }
\ No newline at end of file
+export class DashboardRoutingModule { }
diff --git a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts
index 8533ae2c3..c76248c4a 100644
--- a/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts
+++ b/dmp-frontend/src/app/ui/dataset-create-wizard/dataset-create-wizard.component.ts
@@ -1,25 +1,29 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { MatStepper } from '@angular/material';
-import { Router } from '@angular/router/src/router';
+import { Router } from '@angular/router';
 import { BaseComponent } from '../../core/common/base/base.component';
 import { QuickWizardService } from '../../core/services/quick-wizard/quick-wizard.service';
 import { DatasetCreateWizardModel } from './dataset-create-wizard.model';
+import { IBreadCrumbComponent } from '../misc/breadcrumb/definition/IBreadCrumbComponent';
+import { Observable } from 'rxjs';
+import { BreadcrumbItem } from '../misc/breadcrumb/definition/breadcrumb-item';
 
 @Component({
 	selector: 'dataset-create-wizard.component',
 	templateUrl: 'dataset-create-wizard.component.html',
 	styleUrls: ['./dataset-create-wizard.component.scss'],
 })
-export class DatasetCreateWizard extends BaseComponent implements OnInit {
+export class DatasetCreateWizard extends BaseComponent implements OnInit, IBreadCrumbComponent {
+	breadCrumbs: Observable<BreadcrumbItem[]>;
 	isLinear = false;
 	formGroup: FormGroup;
-	router: Router;
 
 	datasetCreateWizardModel: DatasetCreateWizardModel;
 	@ViewChild('stepper') stepper: MatStepper;
 
 	constructor(
+		private router: Router,
 		private formBuilder: FormBuilder,
 		public quickWizardService: QuickWizardService,
 	) {
@@ -29,6 +33,13 @@ export class DatasetCreateWizard extends BaseComponent implements OnInit {
 	ngOnInit() {
 		this.datasetCreateWizardModel = new DatasetCreateWizardModel();
 		this.formGroup = this.datasetCreateWizardModel.buildForm();
+		this.breadCrumbs = Observable.of([
+            {
+                parentComponentName: 'Dashboard',
+                label: 'Quick Add Dataset',
+                url: '/datasetcreatewizard'
+            }]
+        );
 	}
 
 	save() {
@@ -38,7 +49,7 @@ export class DatasetCreateWizard extends BaseComponent implements OnInit {
 	submit() {
 		this.quickWizardService.createQuickDatasetWizard(this.formGroup.value)
 			.subscribe(data => {
-				this.router.navigateByUrl('/create-add');
+				this.router.navigateByUrl('/home');
 			})
 	}
 
diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html
index ae7d43056..c10c2d0c8 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html
+++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html
@@ -5,8 +5,8 @@
 				<h4>{{'CRITERIA.FILTERS'| translate}}</h4>
 			</mat-card-title>
 			<div class="col"></div>
-			<button class="uploadButton" mat-raised-button color="primary" (click)="fileSave($event)" type="button col-auto">
-				{{'DMP-UPLOAD.UPLOAD-BUTTON' | translate}}
+			<button class="importButton" mat-raised-button color="primary" (click)="fileSave($event)" type="button col-auto">
+				{{'DMP-UPLOAD.ACTIONS.IMPORT' | translate}}
 			</button>
 		</mat-card-header>
 		<div class="row">
diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.html b/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.html
index 246925f20..7b0a06550 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.html
+++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.html
@@ -1,21 +1,19 @@
 <div class="confirmation-dialog">
-	<div class="confirmation-message">
-		<div class="row">
-			<div class="col-auto">
-				{{'DMP-UPLOAD.TITLE' | translate}}
-			</div>
-			<div class="uploadButton">
-				<button mat-raised-button color="primary" (click)="fileInput.click()" type="button col-auto">
-					{{'DMP-UPLOAD.UPLOAD-BUTTON' | translate}}
-				</button>
-				<input class="hidden" #fileInput type="file" (change)="uploadFile($event)">
-			</div>
+	<div class="row">
+		<div class="col-auto align-self-center">
+			<h4>{{'DMP-UPLOAD.TITLE' | translate}}</h4>
+		</div>
+		<div class="col-auto">
+			<button mat-icon-button class="col-auto" (click)="fileInput.click()" type="button">
+				<mat-icon color="primary">attach_file</mat-icon>
+			</button>
+			<input class="hidden" #fileInput type="file" (change)="uploadFile($event)" accept="text/xml">
 		</div>
 	</div>
-	<mat-form-field class="col">
-		<input class="uploadInput" [(ngModel)]="dmpTitle" matInput placeholder="DMP Name" name="uploadFileInput">
-	</mat-form-field>
 	<div class="row">
+		<mat-form-field class="col-12">
+			<input class="uploadInput" [(ngModel)]="dmpTitle" matInput placeholder="DMP Name" name="uploadFileInput">
+		</mat-form-field>
 		<div class="col-auto">
 			<button mat-raised-button color="primary" type="button" (click)="cancel()">{{'DMP-UPLOAD.ACTIONS.CANCEL' | translate}}</button>
 		</div>
diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts
index fbba2d236..65b0c2376 100644
--- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts
+++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts
@@ -52,11 +52,11 @@ export class QuickWizardEditorComponent extends BaseComponent implements OnInit,
         this.breadCrumbs = Observable.of([
             {
                 parentComponentName: 'Dashboard',
-                label: 'QuickCreate',
+                label: 'Quick Create DMP',
                 url: '/quick-wizard'
             }]
         );
-       
+
     }
 
     isActive(step: string): boolean {
@@ -112,7 +112,7 @@ export class QuickWizardEditorComponent extends BaseComponent implements OnInit,
 
     onCallbackSuccess(): void {
         this.uiNotificationService.snackBarNotification(this.isNew ? this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-CREATION') : this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success);
-        this.router.navigate(['/home/create-add']);
+        this.router.navigate(['/home']);
     }
 
     onCallbackError(errorResponse: any) {
@@ -153,4 +153,4 @@ export class QuickWizardEditorComponent extends BaseComponent implements OnInit,
 
 
 
-}
\ No newline at end of file
+}
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 1b1e058b7..0ea2536e3 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -216,7 +216,7 @@
 		}
 	},
 	"DMP-UPLOAD": {
-		"TITLE": "Upload Data Managment Plan via XML",
+		"TITLE": "Import Data Managment Plan",
 		"UPLOAD-BUTTON": "Upload",
 		"ACTIONS": {
 			"IMPORT": "Import",
@@ -256,7 +256,7 @@
 		},
 		"UPLOAD": {
 			"UPLOAD-XML": "Import",
-			"UPLOAD-XML-FILE-TITLE": "Select Xml file with Dataset Profile to Upload",
+			"UPLOAD-XML-FILE-TITLE": "Import Dataset Profile",
 			"UPLOAD-XML-NAME": "Name Of Dataset Profile",
 			"UPLOAD-XML-IMPORT": "File",
 			"UPLOAD-XML-FILE-CANCEL": "Cancel"
@@ -387,7 +387,7 @@
 		},
 		"UPLOAD": {
 			"UPLOAD-XML": "Import",
-			"UPLOAD-XML-FILE-TITLE": "Select Xml file with Dmp Profile to Upload",
+			"UPLOAD-XML-FILE-TITLE": "Import Data Managment Plan Profile",
 			"UPLOAD-XML-NAME": "Name Of Dmp Profile",
 			"UPLOAD-XML-IMPORT": "File",
 			"UPLOAD-XML-FILE-CANCEL": "Cancel"