diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts
index cc305b6cb..cc583ff98 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts
@@ -136,7 +136,7 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr
 					this.breadCrumbs = Observable.of([
 						{
 							parentComponentName: null,
-							label: this.language.instant('NAV-BAR.DATASETS'),
+							label: this.language.instant('NAV-BAR.DATASET'),
 							url: '/datasets',
 							notFoundResolver: [
 								{
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
index ab774e46a..bffbba5f5 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
@@ -139,7 +139,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
 	}
 
 	rowClicked(dmp: DmpListingModel) {
-		this.router.navigate(['/plans/overview/' + dmp.id, { dmpLabel: dmp.label }]);
+		this.router.navigate(['/plans/overview/' + dmp.id]);
 		// this.router.navigate(['/plans/edit/' + dmp.id]);
 	}
 
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
index e119d9383..fb13b0691 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
@@ -53,13 +53,11 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 						.pipe(takeUntil(this._destroyed))
 						.subscribe(data => {
 							this.dmp = data;
+							const breadCrumbs = [];
+							breadCrumbs.push({ parentComponentName: null, label: 'DMPs', url: "/plans" });
+							breadCrumbs.push({ parentComponentName: 'DmpListingComponent', label: this.dmp.label, url: '/overview/' + this.dmp.id });
+							this.breadCrumbs = Observable.of(breadCrumbs);
 						})
-					if (params['dmpLabel'] !== undefined) {
-						const breadCrumbs = [];
-						breadCrumbs.push({ parentComponentName: null, label: 'DMPs', url: "/plans" });
-						breadCrumbs.push({ parentComponentName: 'DmpListingComponent', label: params['dmpLabel'], url: '/overview/' + itemId });
-						this.breadCrumbs = Observable.of(breadCrumbs);
-					}
 				}
 			});
 	}
@@ -102,8 +100,8 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 				this.dmpService.delete(this.dmp.id)
 					.pipe(takeUntil(this._destroyed))
 					.subscribe(
-						complete => { this.onCallbackSuccess() },
-						error => this.onDeleteCallbackError(error)
+					complete => { this.onCallbackSuccess() },
+					error => this.onDeleteCallbackError(error)
 					);
 			}
 		});
diff --git a/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.ts b/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.ts
index bbf88b72a..7d166e524 100644
--- a/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.ts
+++ b/dmp-frontend/src/app/ui/misc/breadcrumb/breadcrumb.component.ts
@@ -49,10 +49,6 @@ export class BreadcrumbComponent implements OnInit {
 	}
 
 	currentUrl(breadcrumb) {
-		if (breadcrumb.url == this.router.url) {
-			return true;
-		} else {
-			false
-		}
+		return (breadcrumb.url === this.router.url);
 	}
 }
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 9ae12f1b4..498f31294 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -55,6 +55,7 @@
 		"DMP": "Dmp",
 		"DMPS": "DMPs",
 		"DATASETS": "Datasets",
+		"DATASET": "Dataset",
 		"PUBLIC-DATASETS": "Explore OpenDMP",
 		"USERS": "Users",
 		"DATASETS-ADMIN": "Dataset Profiles",