diff --git a/dashboard/entity/entities.component.html b/dashboard/entity/entities.component.html
index 05a7a3d7..7c34e395 100644
--- a/dashboard/entity/entities.component.html
+++ b/dashboard/entity/entities.component.html
@@ -17,7 +17,7 @@
     </div>
 		<div *ngIf="!showLoading">
 			<div class="uk-grid uk-flex-middle uk-margin-top uk-margin-medium-bottom" uk-grid>
-				<div class="uk-width-expand@m uk-width-1-1">
+				<div class="uk-width-1-1">
 					<ul *ngIf="!isPortalAdministrator" class="uk-subnav uk-subnav-pill">
 						<li [class.uk-active]="filterForm.get('status').value === 'all'"><a
 								(click)="filterForm.get('status').setValue('all')"><span
@@ -28,7 +28,7 @@
 								(click)="filterForm.get('status').setValue('disabled')"><span class="title">Disabled</span></a></li>
 					</ul>
 				</div>
-				<div class="uk-width-2-5@m uk-width-1-1 uk-flex uk-flex-center uk-flex-wrap uk-flex-middle uk-grid" uk-grid>
+				<div class="uk-width-1-1 uk-flex uk-flex-center uk-flex-wrap uk-flex-middle uk-grid" uk-grid>
 					<div search-input [expandable]="true" [searchControl]="filterForm.get('keyword')" searchInputClass="outer" placeholder="Search entity" class="uk-width-expand"></div>
 					<div>
 						<button	utton class="uk-button uk-button-secondary" [class]="getSelectedEntities().length == 0 ? 'uk-disabled':''" [disabled]="getSelectedEntities().length == 0">
diff --git a/dashboard/page/pages.component.html b/dashboard/page/pages.component.html
index c2b629a8..a0c22516 100644
--- a/dashboard/page/pages.component.html
+++ b/dashboard/page/pages.component.html
@@ -17,7 +17,7 @@
     </div>
 		<ng-container *ngIf="!showLoading">
 			<div class="uk-grid uk-flex-middle uk-margin-top uk-margin-medium-bottom" uk-grid>
-				<div class="uk-width-expand@m uk-width-1-1">
+				<div class="uk-width-1-1">
 					<ul class="uk-subnav uk-subnav-pill">
 						<li [class.uk-active]="filterForm.get('type').value === 'all'"><a
 								(click)="filterForm.get('type').setValue('all')"><span>All pages</span></a></li>
@@ -26,7 +26,7 @@
 								(click)="filterForm.get('type').setValue(type.value)"><span>{{type.label}}</span></a></li>
 					</ul>
 				</div>
-				<div class="uk-width-2-5@m uk-width-1-1 uk-flex uk-flex-center uk-flex-wrap uk-flex-middle uk-grid" uk-grid>
+				<div class="uk-width-1-1 uk-flex uk-flex-center uk-flex-wrap uk-flex-middle uk-grid" uk-grid>
 					<div search-input [expandable]="true" [searchControl]="filterForm.get('keyword')" searchInputClass="outer" placeholder="Search page" class="uk-width-expand"></div>
 					<div>
 						<button	utton class="uk-button uk-button-secondary" [class]="getSelectedPages().length == 0 ? 'uk-disabled':''" [disabled]="getSelectedPages().length == 0">