diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
index 364b36b23..c6e33f086 100644
--- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html
@@ -1,89 +1,90 @@
 <div class="main-content dashboard-main-container h-100" [class.non-auth-main-container]="!this.isAuthenticated()">
 	<div *ngIf="this.isAuthenticated()" class="container-fluid">
-		<div *ngIf="!this.hasDmps()">
-			<div class="main-content">
-				<div class="col-auto">
-					<div class="card" [style.display]="isVisible ? 'block' : 'none'">
-						<!-- <a class="col-auto d-flex" (click)="closeCard()"><span class="ml-auto pt-3 material-icons clear-icon">clear</span></a> -->
-						<p class="card-title mb-0 pt-3">{{'DASHBOARD.DMP-QUESTION' | translate}}</p>
-						<p class="card-content mb-0">{{'DASHBOARD.INFO-DMP-TEXT' | translate}}</p>
-						<p class="card-content pt-3 mb-0">
-							{{'DASHBOARD.NEW-QUESTION' | translate}} <a><u>{{'DASHBOARD.OPEN-AIR-GUIDE' | translate}}</u></a> {{'DASHBOARD.LEARN-MORE' | translate}}
-						</p>
-						<div class="d-flex">
-							<button type="button" class="col-auto align-self-center normal-btn" (click)="openNewDmpDialog()">{{'DASHBOARD.START-YOUR-FIRST-DMP' | translate}}</button>
-							<img class="col-auto ml-auto" src="../../../assets/splash/assets/img/laptop.png" width="116" height="139">
-						</div>
-					</div>
-				</div>
-				<div class="col pt-4 mt-3 pl-4">
-					<div class="personal-usage">{{'DASHBOARD.PERSONAL-USAGE' | translate}}</div>
-					<div class="counter-zero">0</div>
-					<a href="#" class="link">{{'DASHBOARD.DMPS' | translate}}</a>
-					<div class="counter-zero">0</div>
-					<a href="#" class="link">{{'DASHBOARD.DATASET-DESCRIPTIONS' | translate}}</a>
-					<div class="counter-zero">0</div>
-					<a href="#" class="link-disabled">{{'DASHBOARD.GRANTS' | translate}}</a>
-					<div class="counter-zero">0</div>
-					<a href="#" class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a>
-				</div>
-			</div>
-		</div>
-		<div *ngIf="this.hasDmps()">
-			<div class="main-content">
-				<div class="col">
-					<div class="card col-auto mt-0" [style.display]="isVisible ? 'block' : 'none'">
-						<a class="col-auto d-flex" (click)="closeCard()"><span class="ml-auto pt-3 material-icons clear-icon">clear</span></a>
-						<p class="card-content mb-0 pt-0">
-							{{'DASHBOARD.DMP-ABOUT-BEG' | translate}}
-							<b>{{'DASHBOARD.DATASET-DESCRIPTIONS' | translate}}</b>
-							{{'DASHBOARD.DMP-ABOUT-END' | translate}}</p>
-						<div class="d-flex pt-4 pb-4 mt-3 mb-3">
-							<button mat-raised-button type="button" class="col-auto align-self-center yellow-btn" [routerLink]="['/datasets/new']">{{'DASHBOARD.ACTIONS.ADD-DATASET-DESCRIPTION' | translate}}</button>
-						</div>
-					</div>
-					<div class="latest-activity-title">{{'DASHBOARD.LATEST-ACTIVITY' | translate}}</div>
-					<mat-tab-group mat-align-tabs="start" class="remove-border-bottom">
-						<mat-tab label="{{'DASHBOARD.ALL' | translate}} ({{totalRecents}})">
-							<app-recent-edited-activity (totalCountRecentEdited)="onCountAllRecent($event)"></app-recent-edited-activity>
-							<div *ngIf="totalRecents === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
-						</mat-tab>
-						<mat-tab label="{{'DASHBOARD.DRAFTS' | translate}} ({{totalDraftDatasets}})">
-							<app-drafts (totalCountDraftDatasets)="onCountDraftDatasets($event)"></app-drafts>
-							<div *ngIf="totalDraftDatasets === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
-						</mat-tab>
-						<mat-tab label="{{'DASHBOARD.DMPS' | translate}}  ({{totalDmps}})">
-							<app-recent-edited-dmp-activity (totalCountDmps)="onCountDmps($event)"></app-recent-edited-dmp-activity>
-							<div *ngIf="totalDmps === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
-						</mat-tab>
-						<mat-tab label="{{'DASHBOARD.DATASET-DESCRIPTIONS' | translate}} ({{totalDatasets}})">
-							<app-recent-edited-dataset-activity (totalCountDatasets)="onCountDatasets($event)"></app-recent-edited-dataset-activity>
-							<div *ngIf="totalDatasets === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
-							<div *ngIf="totalDatasets === 0" class="col-auto d-flex justify-content-center">
-								<button mat-raised-button class="add-dataset" [routerLink]="['/datasets/new']">
-									<mat-icon>add</mat-icon> {{'DASHBOARD.ACTIONS.ADD-DATASET' | translate}}
-								</button>
+		<div *ngIf="this.dashboardStatisticsData">
+			<div *ngIf="!this.hasDmps()">
+				<div class="main-content">
+					<div class="col-auto">
+						<div class="card" [style.display]="isVisible ? 'block' : 'none'">
+							<!-- <a class="col-auto d-flex" (click)="closeCard()"><span class="ml-auto pt-3 material-icons clear-icon">clear</span></a> -->
+							<p class="card-title mb-0 pt-3">{{'DASHBOARD.DMP-QUESTION' | translate}}</p>
+							<p class="card-content mb-0">{{'DASHBOARD.INFO-DMP-TEXT' | translate}}</p>
+							<p class="card-content pt-3 mb-0">
+								{{'DASHBOARD.NEW-QUESTION' | translate}} <a><u>{{'DASHBOARD.OPEN-AIR-GUIDE' | translate}}</u></a> {{'DASHBOARD.LEARN-MORE' | translate}}
+							</p>
+							<div class="d-flex">
+								<button type="button" class="col-auto align-self-center normal-btn" (click)="openNewDmpDialog()">{{'DASHBOARD.START-YOUR-FIRST-DMP' | translate}}</button>
+								<img class="col-auto ml-auto" src="../../../assets/splash/assets/img/laptop.png" width="116" height="139">
 							</div>
-						</mat-tab>
-					</mat-tab-group>
-				</div>
-				<div class="col-auto stats">
-					<div class="personal-usage">{{'DASHBOARD.PERSONAL-USAGE' | translate}}</div>
-					<div [ngClass]="{'counter': dashboardStatisticsData?.totalDataManagementPlanCount != 0, 'counter-zero': dashboardStatisticsData?.totalDataManagementPlanCount == 0}">
-						{{dashboardStatisticsData?.totalDataManagementPlanCount}}</div>
-					<a [routerLink]="['/plans']" class="link">{{'DASHBOARD.DMPS' | translate}}</a>
-					<div [ngClass]="{'counter': dashboardStatisticsData?.totalDataSetCount != 0, 'counter-zero': dashboardStatisticsData?.totalDataSetCount == 0}">
-						{{dashboardStatisticsData?.totalDataSetCount}}</div>
-					<a [routerLink]="['/datasets']" class="link">{{'DASHBOARD.DATASET-DESCRIPTIONS' | translate}}</a>
-					<div [ngClass]="{'counter': dashboardStatisticsData?.totalGrantCount != 0, 'counter-zero': dashboardStatisticsData?.totalGrantCount == 0}">
-						{{dashboardStatisticsData?.totalGrantCount}}</div>
-					<a href="#" class="link-disabled">{{'DASHBOARD.GRANTS' | translate}}</a>
-					<div [ngClass]="{'counter': dashboardStatisticsData?.totalOrganisationCount != 0, 'counter-zero': dashboardStatisticsData?.totalOrganisationCount == 0}">
-						{{dashboardStatisticsData?.totalOrganisationCount}}</div>
-					<a href="#" class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a>
+						</div>
+					</div>
+					<div class="col pt-4 mt-3 pl-4">
+						<div class="personal-usage">{{'DASHBOARD.PERSONAL-USAGE' | translate}}</div>
+						<div class="counter-zero">0</div>
+						<a href="#" class="link">{{'DASHBOARD.DMPS' | translate}}</a>
+						<div class="counter-zero">0</div>
+						<a href="#" class="link">{{'DASHBOARD.DATASET-DESCRIPTIONS' | translate}}</a>
+						<div class="counter-zero">0</div>
+						<a href="#" class="link-disabled">{{'DASHBOARD.GRANTS' | translate}}</a>
+						<div class="counter-zero">0</div>
+						<a href="#" class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a>
+					</div>
+				</div>
+			</div>
+			<div *ngIf="this.hasDmps()">
+				<div class="main-content">
+					<div class="col">
+						<div class="card col-auto mt-0" [style.display]="isVisible ? 'block' : 'none'">
+							<a class="col-auto d-flex" (click)="closeCard()"><span class="ml-auto pt-3 material-icons clear-icon">clear</span></a>
+							<p class="card-content mb-0 pt-0">
+								{{'DASHBOARD.DMP-ABOUT-BEG' | translate}}
+								<b>{{'DASHBOARD.DATASET-DESCRIPTIONS' | translate}}</b>
+								{{'DASHBOARD.DMP-ABOUT-END' | translate}}</p>
+							<div class="d-flex pt-4 pb-4 mt-3 mb-3">
+								<button mat-raised-button type="button" class="col-auto align-self-center yellow-btn" [routerLink]="['/datasets/new']">{{'DASHBOARD.ACTIONS.ADD-DATASET-DESCRIPTION' | translate}}</button>
+							</div>
+						</div>
+						<div class="latest-activity-title">{{'DASHBOARD.LATEST-ACTIVITY' | translate}}</div>
+						<mat-tab-group mat-align-tabs="start" class="remove-border-bottom">
+							<mat-tab label="{{'DASHBOARD.ALL' | translate}} ({{totalRecents}})">
+								<app-recent-edited-activity (totalCountRecentEdited)="onCountAllRecent($event)"></app-recent-edited-activity>
+								<div *ngIf="totalRecents === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
+							</mat-tab>
+							<mat-tab label="{{'DASHBOARD.DRAFTS' | translate}} ({{totalDraftDatasets}})">
+								<app-drafts (totalCountDraftDatasets)="onCountDraftDatasets($event)"></app-drafts>
+								<div *ngIf="totalDraftDatasets === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
+							</mat-tab>
+							<mat-tab label="{{'DASHBOARD.DMPS' | translate}}  ({{totalDmps}})">
+								<app-recent-edited-dmp-activity (totalCountDmps)="onCountDmps($event)"></app-recent-edited-dmp-activity>
+								<div *ngIf="totalDmps === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
+							</mat-tab>
+							<mat-tab label="{{'DASHBOARD.DATASET-DESCRIPTIONS' | translate}} ({{totalDatasets}})">
+								<app-recent-edited-dataset-activity (totalCountDatasets)="onCountDatasets($event)"></app-recent-edited-dataset-activity>
+								<div *ngIf="totalDatasets === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
+								<div *ngIf="totalDatasets === 0" class="col-auto d-flex justify-content-center">
+									<button mat-raised-button class="add-dataset" [routerLink]="['/datasets/new']">
+										<mat-icon>add</mat-icon> {{'DASHBOARD.ACTIONS.ADD-DATASET' | translate}}
+									</button>
+								</div>
+							</mat-tab>
+						</mat-tab-group>
+					</div>
+					<div class="col-auto stats">
+						<div class="personal-usage">{{'DASHBOARD.PERSONAL-USAGE' | translate}}</div>
+						<div [ngClass]="{'counter': dashboardStatisticsData?.totalDataManagementPlanCount != 0, 'counter-zero': dashboardStatisticsData?.totalDataManagementPlanCount == 0}">
+							{{dashboardStatisticsData?.totalDataManagementPlanCount}}</div>
+						<a [routerLink]="['/plans']" class="link">{{'DASHBOARD.DMPS' | translate}}</a>
+						<div [ngClass]="{'counter': dashboardStatisticsData?.totalDataSetCount != 0, 'counter-zero': dashboardStatisticsData?.totalDataSetCount == 0}">
+							{{dashboardStatisticsData?.totalDataSetCount}}</div>
+						<a [routerLink]="['/datasets']" class="link">{{'DASHBOARD.DATASET-DESCRIPTIONS' | translate}}</a>
+						<div [ngClass]="{'counter': dashboardStatisticsData?.totalGrantCount != 0, 'counter-zero': dashboardStatisticsData?.totalGrantCount == 0}">
+							{{dashboardStatisticsData?.totalGrantCount}}</div>
+						<a href="#" class="link-disabled">{{'DASHBOARD.GRANTS' | translate}}</a>
+						<div [ngClass]="{'counter': dashboardStatisticsData?.totalOrganisationCount != 0, 'counter-zero': dashboardStatisticsData?.totalOrganisationCount == 0}">
+							{{dashboardStatisticsData?.totalOrganisationCount}}</div>
+						<a href="#" class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a>
+					</div>
 				</div>
 			</div>
-
 		</div>
 	</div>
 
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css
index 911680e6f..e6ba7ffbb 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css
@@ -199,6 +199,15 @@ input[type="text"] {
 	padding: 0.3rem 0rem 0.6rem 0rem !important;
 }
 
+.empty-list {
+	text-align: center;
+	font-weight: 300;
+	font-size: 1.25rem;
+	letter-spacing: 0px;
+	color: #212121;
+	opacity: 0.6;
+  }
+
 /* th {
   text-transform: uppercase;
 }
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
index d0246af86..d641dae01 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
@@ -1,3 +1,6 @@
+<div class="col-md-12 d-flex justify-content-center" *ngIf="allRecentActivities == null">
+	<span class="empty-list">{{'DMP-LISTING.EMPTY-LIST' | translate}}</span>
+</div>
 <div *ngIf="allRecentActivities != null">
 	<div class="d-flex flex-direction-row pt-4">
 		<!-- Sort by -->