diff --git a/src/app/modules/data/data.html b/src/app/modules/data/data.html
index f79ff718..fef81512 100644
--- a/src/app/modules/data/data.html
+++ b/src/app/modules/data/data.html
@@ -13,6 +13,6 @@
 </ion-header>
 
 
-<ion-content padding>
+<ion-content class="ion-padding">
 
 </ion-content>
diff --git a/src/app/modules/data/detail/data-detail.html b/src/app/modules/data/detail/data-detail.html
index 8f4c0af8..ac8bdb0c 100644
--- a/src/app/modules/data/detail/data-detail.html
+++ b/src/app/modules/data/detail/data-detail.html
@@ -4,10 +4,10 @@
   <ion-back-button></ion-back-button>
   <ion-menu-button></ion-menu-button>
   </ion-buttons>
-    <ion-title text-center>{{'data.detail.TITLE' | translate}}</ion-title>
+    <ion-title class="ion-text-center">{{'data.detail.TITLE' | translate}}</ion-title>
   </ion-toolbar>
 </ion-header>
-<ion-content padding>
+<ion-content class="ion-padding">
   <ion-refresher slot="fixed" (ionRefresh)="refresh($event.target)">
     <ion-refresher-content pullingIcon="arrow-dropdown" pullingText="{{'data.REFRESH_ACTION' | translate}}"
       refreshingText="{{'data.REFRESHING' | translate}}">
diff --git a/src/app/modules/data/list/data-list-item.html b/src/app/modules/data/list/data-list-item.html
index a2d597a1..181b9efa 100644
--- a/src/app/modules/data/list/data-list-item.html
+++ b/src/app/modules/data/list/data-list-item.html
@@ -1,4 +1,4 @@
-<ion-item text-wrap button="true" lines="inset" [routerLink]="['/data-detail', item.uid]">
+<ion-item class="ion-text-wrap" button="true" lines="inset" [routerLink]="['/data-detail', item.uid]">
   <ion-thumbnail slot="start">
     <img class="stapps-{{item.type}}-thumbnail" src="{{item.image}}" onError="this.src='../../assets/imgs/logo.png';" alt="{{item.name}}" />
   </ion-thumbnail>
diff --git a/src/app/modules/data/list/data-list.html b/src/app/modules/data/list/data-list.html
index 22f87808..70721fc6 100644
--- a/src/app/modules/data/list/data-list.html
+++ b/src/app/modules/data/list/data-list.html
@@ -17,7 +17,7 @@
   </ion-toolbar>
 </ion-header>
 
-<ion-content>
+<ion-content id="data-list">
   <ion-list *ngIf="items">
     <stapps-data-list-item [item]="item" *ngFor="let item of items"></stapps-data-list-item>
   </ion-list>
diff --git a/src/app/modules/menu/context/context-menu.html b/src/app/modules/menu/context/context-menu.html
index c9373aeb..ae22de4e 100644
--- a/src/app/modules/menu/context/context-menu.html
+++ b/src/app/modules/menu/context/context-menu.html
@@ -1,9 +1,6 @@
-<ion-menu type="overlay" menuId="context" side="end">
+<ion-menu type="overlay" menuId="context" contentId="data-list" side="end">
   <ion-card-header>
     <ion-toolbar>
-      <ion-buttons slot="right">
-        <ion-back-button></ion-back-button>
-      </ion-buttons>
       <ion-title>{{'menu.context.title' | translate | titlecase}}</ion-title>
     </ion-toolbar>
   </ion-card-header>
@@ -42,10 +39,12 @@
                 *ngFor="let facet of !filterOption.compact ?
                 filterOption.options.slice(0, compactFilterOptionCount) : filterOption.options">
         <ion-list-header class="h3">
-          {{(facet.onlyOnType ?
-          getTranslatedPropertyName(facet.field, facet.onlyOnType)
-          : (getTranslatedPropertyName(facet.field))) | titlecase}}
-          {{facet.onlyOnType? ' | ' + (getTranslatedType(facet.onlyOnType) | titlecase) : ''}}
+          <ion-label>
+            {{(facet.onlyOnType ?
+              getTranslatedPropertyName(facet.field, facet.onlyOnType)
+              : (getTranslatedPropertyName(facet.field))) | titlecase}}
+              {{facet.onlyOnType? ' | ' + (getTranslatedType(facet.onlyOnType) | titlecase) : ''}}
+          </ion-label>
         </ion-list-header>
         <div *ngIf="facet.buckets.length > 0">
           <ion-item
@@ -77,4 +76,3 @@
     </div>
   </ion-content>
 </ion-menu>
-<ion-router-outlet main></ion-router-outlet>
diff --git a/src/app/modules/menu/navigation/navigation.html b/src/app/modules/menu/navigation/navigation.html
index 9246a587..6ddf834c 100644
--- a/src/app/modules/menu/navigation/navigation.html
+++ b/src/app/modules/menu/navigation/navigation.html
@@ -1,5 +1,5 @@
-<ion-split-pane>
-  <ion-menu>
+<ion-split-pane contentId="main">
+  <ion-menu menuId="main" contentId="main" type="overlay" side="start">
     <ion-header>
       <ion-toolbar>
         <ion-buttons slot="start">
@@ -11,7 +11,11 @@
     <ion-content>
       <ion-list *ngFor="let category of menu">
         <ion-list-header
-          *ngIf="category.name !== ''">{{category.translations[language].name | titlecase}}</ion-list-header>
+          *ngIf="category.name !== ''">
+          <ion-label>
+            {{category.translations[language].name | titlecase}}
+          </ion-label>
+        </ion-list-header>
         <ion-menu-toggle auto-hide="false" *ngFor="let item of category.items">
           <ion-item [routerDirection]="'root'" [routerLink]="[item.route]">
             <ion-icon slot="end" [name]="item.icon"></ion-icon>
@@ -21,7 +25,7 @@
           </ion-item>
         </ion-menu-toggle>
       </ion-list>
-    </ion-content>
+    </ion-content>  
   </ion-menu>
-  <ion-router-outlet main></ion-router-outlet>
+  <ion-router-outlet id="main"></ion-router-outlet>
 </ion-split-pane>
diff --git a/src/app/modules/settings/page/settings-page.component.ts b/src/app/modules/settings/page/settings-page.component.ts
index 3bf484b6..74cf7c22 100644
--- a/src/app/modules/settings/page/settings-page.component.ts
+++ b/src/app/modules/settings/page/settings-page.component.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018, 2019 StApps
+ * Copyright (C) 2018, 2019, 2020 StApps
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation, version 3.
@@ -80,7 +80,7 @@ export class SettingsPageComponent {
    */
   private async presentSettingsResetToast() {
     const toast = await this.toastController.create({
-      cssClass: 'text-center',
+      cssClass: 'ion-text-center',
       duration: 2000,
       message: this.translateService.instant('settings.resetToast.message'),
     });