diff --git a/dmp-frontend/src/app/ui/description/listing/description-listing.component.html b/dmp-frontend/src/app/ui/description/listing/description-listing.component.html
index 077b492b1..3be3468cf 100644
--- a/dmp-frontend/src/app/ui/description/listing/description-listing.component.html
+++ b/dmp-frontend/src/app/ui/description/listing/description-listing.component.html
@@ -1,80 +1,78 @@
-<div class="container-fluid">
-	<div class="row">
-		<div class="col-md-10 offset-md-1">
-			<div class="d-flex flex-direction-row mb-4 mt-4">
-				<div *ngIf="hasListingItems && listingItems && listingItems.length === 0 && !hasLikeCriteria()" class="card mt-0">
-					<!-- <div class="card 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> -->
-					<div class="card-content info-text mb-0">
-						<p>{{'DESCRIPTION-LISTING.TEXT-INFO' | translate}} <u class="pointer" [routerLink]="['/explore-descriptions']">{{'DESCRIPTION-LISTING.LINK-PUBLIC-DATASETS' | translate}}</u> {{'DESCRIPTION-LISTING.TEXT-INFO-REST' | translate}}</p>
-						<p class="mt-4 pt-2">{{'DESCRIPTION-LISTING.TEXT-INFO-PAR' | translate}}
-						<div class="d-flex">
-							<button mat-raised-button class="add-description align-self-center yellow-btn" (click)="addNewDescription()">
-								{{'DESCRIPTION-LISTING.ACTIONS.ADD-DESCRIPTION' | translate}}
-							</button>
-							<img class="col-auto ml-auto laptop-img" src="../../../assets/images/dashboard-popup.png">
-						</div>
-					</div>
-				</div>
-				<p *ngIf="listingItems && listingItems.length > 0 || this.lookup.like" class="col-auto header-title">{{(isPublic ? 'DESCRIPTION-LISTING.TITLE-EXPLORE' : 'DESCRIPTION-LISTING.TITLE') | translate}}</p>
-				<div *ngIf="listingItems && listingItems.length > 0 && !isPublic || this.lookup.like" class="ml-auto">
-					<div class="col-auto">
+<div class="main-content listing-main-container h-100">
+	<div class="container-fluid">
+		<div class="d-flex flex-direction-row">
+			<div *ngIf="hasListingItems && listingItems && listingItems.length === 0 && !hasLikeCriteria()" class="card mt-0">
+				<!-- <div class="card 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> -->
+				<div class="card-content info-text mb-0">
+					<p>{{'DESCRIPTION-LISTING.TEXT-INFO' | translate}} <u class="pointer" [routerLink]="['/explore-descriptions']">{{'DESCRIPTION-LISTING.LINK-PUBLIC-DATASETS' | translate}}</u> {{'DESCRIPTION-LISTING.TEXT-INFO-REST' | translate}}</p>
+					<p class="mt-4 pt-2">{{'DESCRIPTION-LISTING.TEXT-INFO-PAR' | translate}}
+					<div class="d-flex">
 						<button mat-raised-button class="add-description align-self-center yellow-btn" (click)="addNewDescription()">
 							{{'DESCRIPTION-LISTING.ACTIONS.ADD-DESCRIPTION' | translate}}
 						</button>
+						<img class="col-auto ml-auto laptop-img" src="../../../assets/images/dashboard-popup.png">
 					</div>
 				</div>
-				<!-- TODO: implement filters -->
-				<!-- <div *ngIf="listingItems && listingItems.length > 0 || this.lookup.like" class="filter-btn" [style.right]="dialog.getDialogById('filters') ? '446px' : '0px'" [style.width]="scrollbar ? '57px' : '37px'" (click)="openFiltersDialog()">
-					<button mat-raised-button class="p-0">
-						<mat-icon class="mr-4">filter_alt</mat-icon>
-					</button>
-				</div> -->
 			</div>
-			<div>
-				<div class="listing row pb-2">
-					<div *ngIf="listingItems && listingItems.length > 0 || this.lookup.like" class="col-md-12">
-						<div class="d-flex flex-direction-row pt-4">
-							<!-- Sort by -->
-							<span class="d-flex align-items-center">{{'DMP-LISTING.SORT-BY' | translate}}:</span>
-							<mat-form-field class="sort-form col-auto pr-0">
-								<mat-select placeholder="{{'GENERAL.CRITERIA.LIKE'| translate}}" [formControl]="formGroup.get('order')" (selectionChange)="orderByChanged()">
-									<mat-option *ngIf="!isPublic" [value]="order.UpdatedAt">{{enumUtils.toRecentActivityOrderString(order.UpdatedAt)}}</mat-option>
-									<!-- <mat-option *ngIf="isPublic" [value]="order.DATASETPUBLISHED">{{enumUtils.toRecentActivityOrderString(order.DATASETPUBLISHED)}}</mat-option> -->
-									<mat-option [value]="order.Label">{{enumUtils.toRecentActivityOrderString(order.Label)}}</mat-option>
-									<mat-option *ngIf="!isPublic" [value]="order.Status">{{enumUtils.toRecentActivityOrderString(order.Status)}}</mat-option>
-									<!-- <mat-option [value]="order.CREATED">{{enumUtils.toRecentActivityOrderString(order.CREATED)}}</mat-option> -->
-								</mat-select>
-							</mat-form-field>
-							<!-- End of Sort by -->
-							<div class="d-flex flex-row ml-auto">
-								<!-- Guided Tour -->
-								<div *ngIf="!isPublic" class="center-content" (click)="restartTour()">
-									{{ 'DESCRIPTION-LISTING.ACTIONS.TAKE-A-TOUR'| translate }}
-								</div>
-								<!-- End of Guided Tour -->
-								<!-- Search Filter-->
-								<mat-form-field class="search-form ml-auto col-auto" floatLabel="never">
-									<mat-icon matSuffix>search</mat-icon>
-									<input matInput placeholder="{{'GENERAL.CRITERIA.LIKE'| translate}}" name="likeCriteria" [formControl]="formGroup.get('like')">
-									<mat-error *ngIf="formGroup.get('like').hasError('backendError')">{{formGroup.get('like').getError('backendError').message}}</mat-error>
-								</mat-form-field>
-								<!-- End of Search Filter -->
+			<p *ngIf="listingItems && listingItems.length > 0 || this.lookup.like" class="col-auto header-title">{{(isPublic ? 'DESCRIPTION-LISTING.TITLE-EXPLORE' : 'DESCRIPTION-LISTING.TITLE') | translate}}</p>
+			<div *ngIf="listingItems && listingItems.length > 0 && !isPublic || this.lookup.like" class="ml-auto">
+				<div class="col-auto">
+					<button mat-raised-button class="add-description align-self-center yellow-btn" (click)="addNewDescription()">
+						{{'DESCRIPTION-LISTING.ACTIONS.ADD-DESCRIPTION' | translate}}
+					</button>
+				</div>
+			</div>
+			<!-- TODO: implement filters -->
+			<!-- <div *ngIf="listingItems && listingItems.length > 0 || this.lookup.like" class="filter-btn" [style.right]="dialog.getDialogById('filters') ? '446px' : '0px'" [style.width]="scrollbar ? '57px' : '37px'" (click)="openFiltersDialog()">
+				<button mat-raised-button class="p-0">
+					<mat-icon class="mr-4">filter_alt</mat-icon>
+				</button>
+			</div> -->
+		</div>
+		<div>
+			<div class="listing row pb-2">
+				<div *ngIf="listingItems && listingItems.length > 0 || this.lookup.like" class="col-md-12">
+					<div class="d-flex flex-direction-row pt-4">
+						<!-- Sort by -->
+						<span class="d-flex align-items-center">{{'DMP-LISTING.SORT-BY' | translate}}:</span>
+						<mat-form-field class="sort-form col-auto pr-0">
+							<mat-select placeholder="{{'GENERAL.CRITERIA.LIKE'| translate}}" [formControl]="formGroup.get('order')" (selectionChange)="orderByChanged()">
+								<mat-option *ngIf="!isPublic" [value]="order.UpdatedAt">{{enumUtils.toRecentActivityOrderString(order.UpdatedAt)}}</mat-option>
+								<!-- <mat-option *ngIf="isPublic" [value]="order.DATASETPUBLISHED">{{enumUtils.toRecentActivityOrderString(order.DATASETPUBLISHED)}}</mat-option> -->
+								<mat-option [value]="order.Label">{{enumUtils.toRecentActivityOrderString(order.Label)}}</mat-option>
+								<mat-option *ngIf="!isPublic" [value]="order.Status">{{enumUtils.toRecentActivityOrderString(order.Status)}}</mat-option>
+								<!-- <mat-option [value]="order.CREATED">{{enumUtils.toRecentActivityOrderString(order.CREATED)}}</mat-option> -->
+							</mat-select>
+						</mat-form-field>
+						<!-- End of Sort by -->
+						<div class="d-flex flex-row ml-auto">
+							<!-- Guided Tour -->
+							<div *ngIf="!isPublic" class="center-content" (click)="restartTour()">
+								{{ 'DESCRIPTION-LISTING.ACTIONS.TAKE-A-TOUR'| translate }}
 							</div>
+							<!-- End of Guided Tour -->
+							<!-- Search Filter-->
+							<mat-form-field class="search-form ml-auto col-auto" floatLabel="never">
+								<mat-icon matSuffix>search</mat-icon>
+								<input matInput placeholder="{{'GENERAL.CRITERIA.LIKE'| translate}}" name="likeCriteria" [formControl]="formGroup.get('like')">
+								<mat-error *ngIf="formGroup.get('like').hasError('backendError')">{{formGroup.get('like').getError('backendError').message}}</mat-error>
+							</mat-form-field>
+							<!-- End of Search Filter -->
 						</div>
 					</div>
-					<div class="col-md-12 col-sm-12 col-md-9">
-						<div *ngFor="let item of listingItems; let i = index">
-							<app-description-listing-item-component [isPublic]="isPublic" [description]="item" [showDivider]="i != (listingItems.length - 1)"></app-description-listing-item-component>
-						</div>
-						<div *ngIf="listingItems && listingItems.length > 0 && this.lookup?.page?.offset < this.totalCount - 1 && this.pageSize < this.totalCount - 1" class="d-flex justify-content-center">
-							<button type="button" class="btn-load-more" (click)="loadMore()">{{'DESCRIPTION-LISTING.ACTIONS.LOAD-MORE' | translate}}</button>
-						</div>
+				</div>
+				<div class="col-md-12 col-sm-12 col-md-9">
+					<div *ngFor="let item of listingItems; let i = index">
+						<app-description-listing-item-component [isPublic]="isPublic" [description]="item" [showDivider]="i != (listingItems.length - 1)"></app-description-listing-item-component>
 					</div>
-					<div *ngIf="hasListingItems && listingItems && listingItems.length === 0 && this.lookup.like !== ''" class="col-md-12 d-flex justify-content-center pt-4 mt-4 mb-4 pb-4">
-						<span class="empty-list">{{'DESCRIPTION-LISTING.EMPTY-LIST' | translate}}</span>
+					<div *ngIf="listingItems && listingItems.length > 0 && this.lookup?.page?.offset < this.totalCount - 1 && this.pageSize < this.totalCount - 1" class="d-flex justify-content-center">
+						<button type="button" class="btn-load-more" (click)="loadMore()">{{'DESCRIPTION-LISTING.ACTIONS.LOAD-MORE' | translate}}</button>
 					</div>
 				</div>
+				<div *ngIf="hasListingItems && listingItems && listingItems.length === 0 && this.lookup.like !== ''" class="col-md-12 d-flex justify-content-center pt-4 mt-4 mb-4 pb-4">
+					<span class="empty-list">{{'DESCRIPTION-LISTING.EMPTY-LIST' | translate}}</span>
+				</div>
 			</div>
 		</div>
 	</div>
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 0468d49e8..411032d18 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
@@ -1,65 +1,63 @@
+<div class="main-content listing-main-container h-100">
 	<div class="container-fluid">
-		<div class="row">
-			<div class="col-md-10 offset-md-1">
-				<div class="d-flex flex-direction-row mb-4 mt-4">
-					<div *ngIf="hasListingItems && listingItems && listingItems.length === 0 && !hasLikeCriteria()" class="card">
-						<div class="card-content info-text mb-0">
-							<p>{{'DMP-LISTING.TEXT-INFO' | translate}}</p>
-							<p class="mt-4 pt-2">{{'DMP-LISTING.TEXT-INFO-QUESTION' | translate}} <a class="zenodo-link" href="https://zenodo.org/communities/liber-dmp-cat/?page=1&size=20" target="_blank">{{'DMP-LISTING.LINK-ZENODO' | translate}}</a> {{'DMP-LISTING.GET-IDEA' | translate}}</p>
-							<div class="d-flex">
-								<div *ngIf="!isPublic" class="col left-content" (click)="restartTour()">{{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }}</div>
-								<img class="col-auto ml-auto laptop-img" src="../../../assets/images/dashboard-popup.png">
-							</div>
-						</div>
+		<div class="d-flex flex-direction-row">
+			<div *ngIf="hasListingItems && listingItems && listingItems.length === 0 && !hasLikeCriteria()" class="card mt-0">
+				<div class="card-content info-text mb-0">
+					<p>{{'DMP-LISTING.TEXT-INFO' | translate}}</p>
+					<p class="mt-4 pt-2">{{'DMP-LISTING.TEXT-INFO-QUESTION' | translate}} <a class="zenodo-link" href="https://zenodo.org/communities/liber-dmp-cat/?page=1&size=20" target="_blank">{{'DMP-LISTING.LINK-ZENODO' | translate}}</a> {{'DMP-LISTING.GET-IDEA' | translate}}</p>
+					<div class="d-flex">
+						<div *ngIf="!isPublic" class="col left-content" (click)="restartTour()">{{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }}</div>
+						<img class="col-auto ml-auto laptop-img" src="../../../assets/images/dashboard-popup.png">
 					</div>
-					<p *ngIf="listingItems && listingItems.length > 0 || this.lookup.like" class="col-auto header-title">{{(isPublic ? 'GENERAL.TITLES.EXPLORE-PLANS' : 'GENERAL.TITLES.PLANS') | translate}}</p>
-					<!-- TODO: implement filters -->
-					<!-- <div class="filter-btn" [style.right]="this.dialog.getDialogById('filters') ? '446px' : '0px'" [style.width]="scrollbar || this.dialog.getDialogById('filters') ? '57px' : '37px'" (click)="openFiltersDialog()">
-						<button mat-raised-button class="p-0">
-							<mat-icon class="mr-4">filter_alt</mat-icon>
-						</button>
-					</div> -->
 				</div>
-				<div>
-					<div class="listing row pb-2">
-						<div *ngIf="listingItems && listingItems.length > 0 || this.lookup.like" class="col-md-12">
-							<div class="d-flex flex-direction-row pt-4">
-								<!-- Sort by -->
-								<span class="d-flex align-items-center">{{'DMP-LISTING.SORT-BY' | translate}}:</span>
-								<mat-form-field class="sort-form col-auto">
-									<mat-select placeholder="{{'GENERAL.CRITERIA.LIKE'| translate}}" [formControl]="formGroup.get('order')" (selectionChange)="orderByChanged()">
-										<mat-option *ngIf="!isPublic" [value]="order.UpdatedAt">{{enumUtils.toRecentActivityOrderString(order.UpdatedAt)}}</mat-option>
-										<!-- <mat-option *ngIf="isPublic" [value]="order.PUBLISHED">{{enumUtils.toRecentActivityOrderString(order.PUBLISHED)}}</mat-option> -->
-										<mat-option [value]="order.Label">{{enumUtils.toRecentActivityOrderString(order.Label)}}</mat-option>
-										<mat-option *ngIf="!isPublic" [value]="order.Status">{{enumUtils.toRecentActivityOrderString(order.Status)}}</mat-option>
-									</mat-select>
-								</mat-form-field>
-								<div class="d-flex flex-row ml-auto">
-									<div *ngIf="!isPublic" class="center-content" (click)="restartTour()">{{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }}</div>
-									<mat-form-field class="search-form ml-auto col-auto pr-0"
-										floatLabel="never">
-										<mat-icon matSuffix>search</mat-icon>
-										<input matInput placeholder="{{'GENERAL.CRITERIA.LIKE'| translate}}" name="likeCriteria"
-											[formControl]="formGroup.get('like')">
-										<mat-error *ngIf="formGroup.get('like').hasError('backendError')">
-											{{formGroup.get('like').getError('backendError').message}}</mat-error>
-									</mat-form-field>
-								</div>
-							</div>
-						</div>
-						<div class="col-md-12 col-sm-12 col-md-9">
-							<div *ngFor="let item of listingItems; let i = index">
-								<app-dmp-listing-item-component [showDivider]="i != (listingItems.length - 1)" [dmp]="item" [isPublic]="isPublic"></app-dmp-listing-item-component>
-							</div>
-							<div *ngIf="listingItems && listingItems.length > 0 && this.lookup?.page?.offset < this.totalCount - 1 && this.pageSize < this.totalCount - 1" class="d-flex justify-content-center">
-								<button type="button" class="btn-load-more" (click)="loadMore()">{{'GENERAL.ACTIONS.LOAD-MORE' | translate}}</button>
-							</div>
-						</div>
-						<div *ngIf="hasListingItems && listingItems && listingItems.length === 0 && this.lookup.like !== ''" class="col-md-12 d-flex justify-content-center pt-4 mt-4 mb-4 pb-4">
-							<span class="empty-list">{{'DMP-LISTING.EMPTY-LIST' | translate}}</span>
+			</div>
+			<p *ngIf="listingItems && listingItems.length > 0 || this.lookup.like" class="col-auto header-title">{{(isPublic ? 'GENERAL.TITLES.EXPLORE-PLANS' : 'GENERAL.TITLES.PLANS') | translate}}</p>
+			<!-- TODO: implement filters -->
+			<!-- <div class="filter-btn" [style.right]="this.dialog.getDialogById('filters') ? '446px' : '0px'" [style.width]="scrollbar || this.dialog.getDialogById('filters') ? '57px' : '37px'" (click)="openFiltersDialog()">
+				<button mat-raised-button class="p-0">
+					<mat-icon class="mr-4">filter_alt</mat-icon>
+				</button>
+			</div> -->
+		</div>
+		<div>
+			<div class="listing row pb-2">
+				<div *ngIf="listingItems && listingItems.length > 0 || this.lookup.like" class="col-md-12">
+					<div class="d-flex flex-direction-row pt-4">
+						<!-- Sort by -->
+						<span class="d-flex align-items-center">{{'DMP-LISTING.SORT-BY' | translate}}:</span>
+						<mat-form-field class="sort-form col-auto">
+							<mat-select placeholder="{{'GENERAL.CRITERIA.LIKE'| translate}}" [formControl]="formGroup.get('order')" (selectionChange)="orderByChanged()">
+								<mat-option *ngIf="!isPublic" [value]="order.UpdatedAt">{{enumUtils.toRecentActivityOrderString(order.UpdatedAt)}}</mat-option>
+								<!-- <mat-option *ngIf="isPublic" [value]="order.PUBLISHED">{{enumUtils.toRecentActivityOrderString(order.PUBLISHED)}}</mat-option> -->
+								<mat-option [value]="order.Label">{{enumUtils.toRecentActivityOrderString(order.Label)}}</mat-option>
+								<mat-option *ngIf="!isPublic" [value]="order.Status">{{enumUtils.toRecentActivityOrderString(order.Status)}}</mat-option>
+							</mat-select>
+						</mat-form-field>
+						<div class="d-flex flex-row ml-auto">
+							<div *ngIf="!isPublic" class="center-content" (click)="restartTour()">{{ 'GENERAL.ACTIONS.TAKE-A-TOUR'| translate }}</div>
+							<mat-form-field class="search-form ml-auto col-auto pr-0"
+								floatLabel="never">
+								<mat-icon matSuffix>search</mat-icon>
+								<input matInput placeholder="{{'GENERAL.CRITERIA.LIKE'| translate}}" name="likeCriteria"
+									[formControl]="formGroup.get('like')">
+								<mat-error *ngIf="formGroup.get('like').hasError('backendError')">
+									{{formGroup.get('like').getError('backendError').message}}</mat-error>
+							</mat-form-field>
 						</div>
 					</div>
 				</div>
+				<div class="col-md-12 col-sm-12 col-md-9">
+					<div *ngFor="let item of listingItems; let i = index">
+						<app-dmp-listing-item-component [showDivider]="i != (listingItems.length - 1)" [dmp]="item" [isPublic]="isPublic"></app-dmp-listing-item-component>
+					</div>
+					<div *ngIf="listingItems && listingItems.length > 0 && this.lookup?.page?.offset < this.totalCount - 1 && this.pageSize < this.totalCount - 1" class="d-flex justify-content-center">
+						<button type="button" class="btn-load-more" (click)="loadMore()">{{'GENERAL.ACTIONS.LOAD-MORE' | translate}}</button>
+					</div>
+				</div>
+				<div *ngIf="hasListingItems && listingItems && listingItems.length === 0 && this.lookup.like !== ''" class="col-md-12 d-flex justify-content-center pt-4 mt-4 mb-4 pb-4">
+					<span class="empty-list">{{'DMP-LISTING.EMPTY-LIST' | translate}}</span>
+				</div>
 			</div>
 		</div>
 	</div>
+</div>