diff --git a/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts b/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
index 78fbb8596..3ce5fa9cb 100644
--- a/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
+++ b/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts
@@ -1,5 +1,5 @@
 export interface DatasetListingModel {
-	id: String;
+	id: string;
 	label: String;
 	dmp: String;
 	dmpId: String;
diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
index b6616610c..38e210419 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
@@ -29,7 +29,7 @@
 		<!-- <a class="col-auto" [matMenuTriggerFor]="actionsMenu" *ngIf="!publicMode"><span class="material-icons icon-align pl-2">more_horiz</span></a> -->
 	</div>
 	<mat-menu #actionsMenu="matMenu">
-		<button mat-menu-item (click)="openDmpSearchDialogue(dataset.id)" class="menu-item">
+		<button mat-menu-item (click)="openDmpSearchDialogue(dataset)" class="menu-item">
 			<mat-icon>file_copy</mat-icon>{{'DATASET-WIZARD.ACTIONS.COPY-DATASET' | translate}}
 		</button>
 		<button mat-menu-item (click)="openConfirm(dataset.id)" class="menu-item">
diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts
index edbfa95dd..6300f3ca8 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts
@@ -118,7 +118,7 @@ export class DatasetListingItemComponent extends BaseComponent implements OnInit
 		return filename;
 	}
 
-	openShareDialog(dmpRowId: any, dmpRowName: any, activity: any) {
+	openShareDialog(dmpRowId: any, dmpRowName: any) {
 		const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
 			// height: '250px',
 			// width: '700px',
diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
index 40d668854..7dea40018 100644
--- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
+++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
@@ -17,7 +17,8 @@
 								{{ roleDisplayFromList(dataset.users) }}
 							</p>
 						</div>
-						<div class="d-flex mr-4">
+						<span>.</span>
+						<div class="d-flex ml-2 mr-2">
 							<div *ngIf="dataset.public" class="d-flex flex-row">
 								<mat-icon class="status-icon">public</mat-icon>
 								{{'DMP-OVERVIEW.PUBLIC' | translate}}
@@ -27,14 +28,15 @@
 								{{'DMP-OVERVIEW.PRIVATE' | translate}}
 							</div>
 						</div>
-						<div *ngIf="lockStatus" class="d-flex flex-row mr-4">
+						<span>.</span>
+						<div *ngIf="lockStatus" class="d-flex flex-row ml-2 mr-2">
 							<mat-icon class="status-icon">lock_outline</mat-icon>
 							{{'DMP-OVERVIEW.LOCKED' | translate}}
 						</div>
-						<div class="d-flex mr-3">{{'GENERAL.STATUSES.EDIT' | translate}} :
+						<div class="d-flex ml-2 mr-3">{{'GENERAL.STATUSES.EDIT' | translate}} :
 							{{dataset.modified | date:"longDate"}}
 						</div>
-						<div class="d-flex mr-4">
+						<div class="d-flex ml-2 mr-4">
 							<div *ngIf="dataset.status" class="d-flex flex-row uppercase">
 								<mat-icon class="status-icon">check</mat-icon>
 								{{'TYPES.DATASET-STATUS.FINALISED' | translate}}
@@ -160,4 +162,4 @@
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss
index e80bc3a5a..6ab4cd95a 100644
--- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss
+++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss
@@ -135,6 +135,7 @@
 
 .label-txt, .label2-txt {
   color: #848484;
+  font-weight: 400;
 }
 
 .dataset-label {
@@ -278,4 +279,4 @@
 .show-more-btn {
   display: flex;
   justify-content: center;
-}
\ No newline at end of file
+}
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html
index 33bb45077..13bf9c279 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html
@@ -31,7 +31,7 @@
 						<button type="button" class="btn-load-more" (click)="loadMore()">{{'GENERAL.ACTIONS.LOAD-MORE' | translate}}</button>
 					</div>
 				</div>
-				<div class="col-md-12 d-flex justify-content-center" *ngIf="listingItems.length === 0">
+				<div class="col-md-12 d-flex justify-content-center" *ngIf="listingItems && listingItems.length === 0">
 					<span class="empty-list">{{'DMP-LISTING.EMPTY-LIST' | translate}}</span>
 				</div>
 			</div>
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
index 0c944ddd6..0b442ae54 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
@@ -13,10 +13,11 @@
 					</div>
 					<div class="row d-flex align-items-center mt-3 mb-4 label-txt">
 						<div *ngIf="isUserDMPRelated()" class="d-flex">
-							<p class="ml-0 mr-3 mb-0 label2-txt">
+							<p class="ml-0 mr-2 mb-0 label2-txt">
 								{{ roleDisplayFromList(dmp.users) }}</p>
 						</div>
-						<div class="d-flex mr-4">
+						<span>.</span>
+						<div class="d-flex ml-2 mr-2">
 							<div *ngIf="dmp.isPublic" class="d-flex flex-row">
 								<mat-icon class="status-icon">public</mat-icon>
 								{{'DMP-OVERVIEW.PUBLIC' | translate}}
@@ -30,15 +31,12 @@
 							<mat-icon class="status-icon">lock_outline</mat-icon>
 							{{'DMP-OVERVIEW.LOCKED' | translate}}
 						</div>
-						<!-- <button class="d-flex mr-4 version-btn label2-txt"
-							(click)="viewVersions(dmp.groupId, dmp.label)">
-							{{'DMP-LISTING.ACTIONS.VIEW-VERSION' | translate}}
-						</button> -->
-						<mat-form-field appearance="outline" class="versions-select mr-4">
+						<span>.</span>
+						<mat-form-field appearance="outline" class="versions-select ml-2 mr-4">
 							<mat-select placeholder="{{'DMP-LISTING.VERSION' | translate}} {{dmp.version}}" [(ngModel)]="version" (ngModelChange)="versionChanged(version.id)">
-							  <mat-option *ngFor="let version of versions" [value]="version">{{'DMP-LISTING.VERSION' | translate}} {{version.version}}</mat-option>
+								<mat-option *ngFor="let version of versions" [value]="version">{{'DMP-LISTING.VERSION' | translate}} {{version.version}}</mat-option>
 							</mat-select>
-						  </mat-form-field>
+						</mat-form-field>
 						<div class="d-flex mr-4">{{'GENERAL.STATUSES.EDIT' | translate}} :
 							{{dmp.modifiedTime | date:"longDate"}}
 						</div>
@@ -50,19 +48,13 @@
 						</div>
 					</div>
 					<div class="row">
-						<button *ngIf="isAuthenticated()" (click)="cloneClicked(dmp)" mat-mini-fab
-							class="mr-3 d-flex justify-content-center align-items-center"
-							matTooltip="{{'DMP-LISTING.ACTIONS.CLONE' | translate}}" matTooltipPosition="above">
+						<button *ngIf="isAuthenticated()" (click)="cloneClicked(dmp)" mat-mini-fab class="mr-3 d-flex justify-content-center align-items-center" matTooltip="{{'DMP-LISTING.ACTIONS.CLONE' | translate}}" matTooltipPosition="above">
 							<mat-icon class="mat-mini-fab-icon">content_copy</mat-icon>
 						</button>
-						<button *ngIf="isDraftDmp(dmp) && isUserOwner && !lockStatus" (click)="editClicked(dmp)"
-							mat-mini-fab class="mr-3 d-flex justify-content-center align-items-center"
-							matTooltip="{{'DMP-LISTING.ACTIONS.EDIT' | translate}}" matTooltipPosition="above">
+						<button *ngIf="isDraftDmp(dmp) && isUserOwner && !lockStatus" (click)="editClicked(dmp)" mat-mini-fab class="mr-3 d-flex justify-content-center align-items-center" matTooltip="{{'DMP-LISTING.ACTIONS.EDIT' | translate}}" matTooltipPosition="above">
 							<mat-icon class="mat-mini-fab-icon">create</mat-icon>
 						</button>
-						<button *ngIf="isDraftDmp(dmp) && isUserOwner && !lockStatus" (click)="deleteClicked()"
-							mat-mini-fab class="mr-3 d-flex justify-content-center align-items-center"
-							matTooltip="{{'DMP-LISTING.ACTIONS.DELETE' | translate}}" matTooltipPosition="above">
+						<button *ngIf="isDraftDmp(dmp) && isUserOwner && !lockStatus" (click)="deleteClicked()" mat-mini-fab class="mr-3 d-flex justify-content-center align-items-center" matTooltip="{{'DMP-LISTING.ACTIONS.DELETE' | translate}}" matTooltipPosition="above">
 							<mat-icon class="mat-mini-fab-icon">delete</mat-icon>
 						</button>
 					</div>
@@ -103,8 +95,7 @@
 						</div>
 					</div>
 					<div class="row mt-2 add-dataset-txt">
-						<button class="add-dataset-btn" *ngIf="isDraftDmp(dmp) && isUserOwner"
-							(click)="addDataset(dmp.id)">
+						<button class="add-dataset-btn" *ngIf="isDraftDmp(dmp) && isUserOwner" (click)="addDataset(dmp.id)">
 							<mat-icon>add</mat-icon>
 							{{'DMP-LISTING.ACTIONS.ADD-DATASET-SHORT' | translate}}
 						</button>
@@ -118,14 +109,10 @@
 								<textarea #doi class="doi-txt">{{ dmp.doi }}</textarea>
 							</p>
 							<div class="d-flex justify-content-end">
-								<button (click)="copyDoi(doi)" mat-mini-fab
-									class="mr-2 d-flex justify-content-center align-items-center"
-									matTooltip="{{'DMP-LISTING.ACTIONS.CLONE' | translate}}" matTooltipPosition="above">
+								<button (click)="copyDoi(doi)" mat-mini-fab class="mr-2 d-flex justify-content-center align-items-center" matTooltip="{{'DMP-LISTING.ACTIONS.CLONE' | translate}}" matTooltipPosition="above">
 									<mat-icon class="mat-mini-fab-icon">content_copy</mat-icon>
 								</button>
-								<button mat-mini-fab class="mr-2 d-flex justify-content-center align-items-center"
-									matTooltip="{{'GRANT-EDITOR.ACTIONS.VISIT-WEBSITE' | translate}}"
-									matTooltipPosition="above">
+								<button mat-mini-fab class="mr-2 d-flex justify-content-center align-items-center" matTooltip="{{'GRANT-EDITOR.ACTIONS.VISIT-WEBSITE' | translate}}" matTooltipPosition="above">
 									<a [href]="createDoiLink(dmp.doi)" class="doi-link" target="_blank">
 										<mat-icon class="mat-mini-fab-icon">launch</mat-icon>
 									</a>
@@ -145,8 +132,7 @@
 								<hr class="hr-line">
 							</div>
 						</div>
-						<div *ngIf="hasDoi(dmp) && isFinalizedDmp(dmp) && !this.isPublicView && isUserOwner"
-							(click)="getDoi(dmp)" class="row ml-0 mr-0 pl-4 pb-3 d-flex align-items-center">
+						<div *ngIf="hasDoi(dmp) && isFinalizedDmp(dmp) && !this.isPublicView && isUserOwner" (click)="getDoi(dmp)" class="row ml-0 mr-0 pl-4 pb-3 d-flex align-items-center">
 							<button mat-mini-fab class="frame-btn">
 								<mat-icon class="mat-mini-fab-icon">archive</mat-icon>
 							</button>
@@ -159,16 +145,14 @@
 							<p class="mb-0 mr-0 pl-2 frame-txt" [matMenuTriggerFor]="exportMenu">
 								{{ 'DMP-LISTING.ACTIONS.EXPORT' | translate }}</p>
 						</div>
-						<div class="row ml-0 mr-0 pl-4 pb-3 d-flex align-items-center"
-							*ngIf="isUserOwner && !lockStatus" (click)="newVersion(dmp.id, dmp.label)">
+						<div class="row ml-0 mr-0 pl-4 pb-3 d-flex align-items-center" *ngIf="isUserOwner && !lockStatus" (click)="newVersion(dmp.id, dmp.label)">
 							<button mat-mini-fab class="frame-btn">
 								<mat-icon class="mat-mini-fab-icon">add_to_photos</mat-icon>
 							</button>
 							<p class="mb-0 pl-2 frame-txt">{{ 'DMP-LISTING.ACTIONS.START-NEW-VERSION' | translate }}
 							</p>
 						</div>
-						<div *ngIf="!dmp.isPublic && showPublishButton(dmp) && isUserOwner"
-							class="row ml-0 mr-0 pl-4 pb-3 d-flex align-items-center" (click)="publish(dmp.id)">
+						<div *ngIf="!dmp.isPublic && showPublishButton(dmp) && isUserOwner" class="row ml-0 mr-0 pl-4 pb-3 d-flex align-items-center" (click)="publish(dmp.id)">
 							<button mat-mini-fab class="frame-btn">
 								<mat-icon class="mat-mini-fab-icon">public</mat-icon>
 							</button>
@@ -211,12 +195,10 @@
 										<p class="authors-role">{{ roleDisplay(user) }}</p>
 									</div>
 								</div>
-								<button *ngIf="isUserOwner && !dmp.status && user.role" (click)="removeUserFromDmp(user)"
-									class="remove-btn">{{ 'GENERAL.CONFIRMATION-DIALOG.ACTIONS.REMOVE' | translate}}</button>
+								<button *ngIf="isUserOwner && !dmp.status && user.role" (click)="removeUserFromDmp(user)" class="remove-btn">{{ 'GENERAL.CONFIRMATION-DIALOG.ACTIONS.REMOVE' | translate}}</button>
 							</div>
 						</div>
-						<div *ngIf="isUserOwner" (click)="openShareDialog(dmp.id,dmp.label)"
-							class="row mt-3 mb-3 d-flex align-items-center justify-content-center">
+						<div *ngIf="isUserOwner" (click)="openShareDialog(dmp.id,dmp.label)" class="row mt-3 mb-3 d-flex align-items-center justify-content-center">
 							<button mat-raised-button class="invite-btn">
 								<mat-icon>group_add</mat-icon>
 								{{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}}
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss
index be4874980..1923ad102 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss
@@ -143,6 +143,7 @@
 .label-txt,
 .label2-txt {
   color: #848484;
+  font-weight: 400;
 }
 
 .dmp-label {