diff --git a/src/app/pages/export-account/export-account.page.html b/src/app/pages/export-account/export-account.page.html
index 9958ac0..adee07f 100644
--- a/src/app/pages/export-account/export-account.page.html
+++ b/src/app/pages/export-account/export-account.page.html
@@ -18,18 +18,21 @@
   </div>
   <ng-template #showExport>
     <div>
-      <p class="ion-text-wrap">Backup key <app-copy-button [copyInput]="encryptionKey">
+      <p class="ion-text-wrap"><span class="large-font">Backup key</span>
+        <app-copy-button [copyInput]="encryptionKey">
         </app-copy-button>
       </p>
 
-      <ion-label>{{encryptionKey}}</ion-label>
+      <p class="normal-font highlight-bg">{{encryptionKey}}</p>
     </div>
     <div>
-      <p class="ion-text-wrap">Account Backup <app-copy-button [copyInput]="dataToExport">
+      <p class="ion-text-wrap">
+        <span class="large-font">Backup Data</span>
+        <app-copy-button [copyInput]="dataToExport">
         </app-copy-button>
       </p>
-
-      <ion-note class="ion-text-wrap">{{dataToExport}}</ion-note>
+      <ion-textarea disabled readonly [value]="dataToExport" rows="10">
+      </ion-textarea>
     </div>
 
     <div class="ion-margin ion-text-center">
diff --git a/src/app/pages/import-account/import-account.page.html b/src/app/pages/import-account/import-account.page.html
index accd234..7cdee97 100644
--- a/src/app/pages/import-account/import-account.page.html
+++ b/src/app/pages/import-account/import-account.page.html
@@ -3,16 +3,16 @@
 <ion-content class="ion-padding">
   <div>
     <form [formGroup]="importAccountForm">
-      <ion-item>
-        <ion-label position="stacked">Backup Data</ion-label>
-        <ion-textarea formControlName="backupData" placeholder="c8e4adc24479220e33aa78 ..." auto-grow autofocus>
-        </ion-textarea>
-      </ion-item>
       <ion-item>
         <ion-label position="stacked">Backup Key</ion-label>
         <app-dynamic-input [inputType]="'text'" [form]="importAccountForm" [controlName]="'backupKey'"
           [placeHolder]="'just five words expected here'"></app-dynamic-input>
       </ion-item>
+      <ion-item>
+        <ion-label position="stacked">Backup Data</ion-label>
+        <ion-textarea formControlName="backupData" placeholder="c8e4adc24479220e33aa78 ..." auto-grow autofocus>
+        </ion-textarea>
+      </ion-item>
       <ion-item>
         <ion-label position="stacked">Password</ion-label>
         <app-dynamic-input [inputType]="'password'" [form]="importAccountForm" [controlName]="'password'"
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index a063953..5dacd77 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,6 +1,6 @@
 export const environment = {
   production: true,
-  AUTH_TIMEOUT: 180000,
+  AUTH_TIMEOUT: 180000, // 3mins
   DB_NAME: '_sazaDBOfflineProd',
 };
 
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 85d92b4..263a8d2 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,7 +4,7 @@
 
 export const environment = {
   production: false,
-  AUTH_TIMEOUT: 600000,
+  AUTH_TIMEOUT: 600000, // 10mins
   DB_NAME: '_sazaDBOfflineDev',
 };
 
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 94fa663..3b05159 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -134,4 +134,10 @@ ion-header {
 
 .active-menu {
   --background: var(--ion-color-light-shade, #d7d8da);
+}
+
+.highlight-bg {
+  background-color: var(--ion-color-light-shade, #d7d8da);
+  padding: 15px;
+  border-radius: 20px;
 }
\ No newline at end of file