diff --git a/src/app/app.component.html b/src/app/app.component.html
index 6f04aafca..8132056c0 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,6 +1,6 @@
 <ion-app>
   <ion-split-pane contentId="main-content">
-    <ion-menu contentId="main-content" type="overlay">
+    <ion-menu contentId="main-content" type="overlay" swipeGesture="false">
       <ion-header [translucent]="true" class="ion-no-border">
         <div class="sub-menu-toolbar">
           <div slot="start" class="img-mainDiv">
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index dfa8e9b6c..b6d0043dc 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -65,13 +65,13 @@ export class AppComponent {
             {
               text: texts['CANCEL'],
               role: 'cancel',
-              cssClass: "alert-button",
+              cssClass: "alert-button-bg-white",
               handler: () => { }
             },
             {
               text: texts['CONFIRM'],
               role: 'confirm',
-              cssClass: "alert-button-bg-white",
+              cssClass: "alert-button",
               handler: () => { 
                 navigator['app'].exitApp();
               }
diff --git a/src/app/core/constants/formConstant.ts b/src/app/core/constants/formConstant.ts
index efef3e6ec..998c271b2 100644
--- a/src/app/core/constants/formConstant.ts
+++ b/src/app/core/constants/formConstant.ts
@@ -43,8 +43,8 @@ export const PLATFORMS: IFORM = {
 }
 
 export const HELP: IFORM = {
-	"type": "help",
-	"subType": "helpForm",
-	"action": "helpFields",
+	"type": "helpApp",
+	"subType": "helpAppForm",
+	"action": "helpAppFields",
 	"templateName":"defaultTemplate"
 }
\ No newline at end of file
diff --git a/src/app/core/services/attachment/attachment.service.ts b/src/app/core/services/attachment/attachment.service.ts
index b91a414f8..8284b3919 100644
--- a/src/app/core/services/attachment/attachment.service.ts
+++ b/src/app/core/services/attachment/attachment.service.ts
@@ -66,7 +66,15 @@ export class AttachmentService {
     let data ={
         type:'removeCurrentPhoto'
     }
+    this.translate
+            .get([
+                "REMOVE_CURRENT_PHOTO"
+            ])
+            .subscribe((data) => {
+                this.texts = data;
+            });
     this.actionSheetController.dismiss(data);
+    this.presentToast(this.texts["REMOVE_CURRENT_PHOTO"], "success");
     }
     async selectImage(type) {
         this.translate
diff --git a/src/app/core/services/auth/auth.service.ts b/src/app/core/services/auth/auth.service.ts
index d64e7e4e0..00b8b2409 100644
--- a/src/app/core/services/auth/auth.service.ts
+++ b/src/app/core/services/auth/auth.service.ts
@@ -17,6 +17,7 @@ import { TranslateService } from '@ngx-translate/core';
 })
 export class AuthService {
   baseUrl: any;
+  user: any;
   constructor(
     private localStorage: LocalStorageService,
     private httpService: HttpService,
@@ -67,7 +68,8 @@ export class AuthService {
     if (!result.access_token) { throw Error(); };
     this.userService.token = result;
     await this.localStorage.setLocalData(localKeys.TOKEN, result);
-    const userData = await this.profileService.getProfileDetailsAPI();
+    this.user = data.result.user;
+    const userData = await this.profileService.getProfileDetailsFromAPI(this.user.isAMentor,this.user._id);
     if (!userData) {
       this.localStorage.delete(localKeys.TOKEN);
       throw Error();
@@ -82,7 +84,6 @@ export class AuthService {
   }
 
   async logoutAccount(skipApiCall?: boolean) {
-    await this.loaderService.startLoader();
     const config = {
       url: urlConstants.API_URLS.LOGOUT_ACCOUNT,
       payload: {
@@ -97,13 +98,11 @@ export class AuthService {
       this.localStorage.delete(localKeys.TOKEN);
       this.userService.token = null;
       this.userService.userEvent.next(null);
-      await this.loaderService.stopLoader();
       this.router.navigate([`/${CommonRoutes.AUTH}/${CommonRoutes.LOGIN}`], {
         replaceUrl: true
       });
     }
     catch (error) {
-      await this.loaderService.stopLoader();
     }
   }
 
diff --git a/src/app/core/services/http/http.service.ts b/src/app/core/services/http/http.service.ts
index b59ff8101..f9634b2f4 100644
--- a/src/app/core/services/http/http.service.ts
+++ b/src/app/core/services/http/http.service.ts
@@ -166,7 +166,12 @@ export class HttpService {
         break
       case 401:
         let auth = this.injector.get(AuthService);
-        auth.logoutAccount(true);
+        this.localStorage.getLocalData(localKeys.USER_DETAILS).then(async (data)=>{
+          if(data._id){
+            await auth.logoutAccount(true);
+            this.toastService.showToast(msg ? msg.message : 'SOMETHING_WENT_WRONG', 'danger')
+          }
+        })
         break
       default:
         this.toastService.showToast(msg ? msg.message : 'SOMETHING_WENT_WRONG', 'danger')
diff --git a/src/app/core/services/profile/profile.service.ts b/src/app/core/services/profile/profile.service.ts
index 40234c3a5..2ad031553 100644
--- a/src/app/core/services/profile/profile.service.ts
+++ b/src/app/core/services/profile/profile.service.ts
@@ -39,8 +39,9 @@ export class ProfileService {
       let userDetails = await this.localStorage.getLocalData(localKeys.USER_DETAILS);
       userDetails.user = null;
       let profileData = await this.getProfileDetailsAPI();
-      await this.localStorage.setLocalData(localKeys.USER_DETAILS, profileData);
-      this.userService.userEvent.next(profileData);
+      let profileDatas = await {...userDetails, ...profileData};
+      await this.localStorage.setLocalData(localKeys.USER_DETAILS, profileDatas);
+      this.userService.userEvent.next(profileDatas);
       this.loaderService.stopLoader();
       this._location.back();
       (showToast)?this.toast.showToast(data.message, "success"):null;
diff --git a/src/app/core/services/util/util.service.ts b/src/app/core/services/util/util.service.ts
index a8b999379..00acf66ab 100644
--- a/src/app/core/services/util/util.service.ts
+++ b/src/app/core/services/util/util.service.ts
@@ -51,20 +51,21 @@ export class UtilService {
         header: texts[msg.header],
         message: texts[msg.message],
         buttons: [
+          {
+            text: texts[msg.submit],
+            cssClass: 'alert-button-bg-white',
+            handler: () => {
+              resolve(true);
+            }
+          },
           {
             text: texts[msg.cancel],
             role: 'cancel',
-            cssClass: 'alert-button-bg-white',
+            cssClass: 'alert-button-red',
             handler: (blah) => {
               resolve(false);
             }
-          }, {
-            text: texts[msg.submit],
-            cssClass: 'alert-button-red',
-            handler: () => {
-              resolve(true);
-            }
-          }
+          },
         ]
       });
       await alert.present();
@@ -76,7 +77,7 @@ export class UtilService {
     this.translate
       .get([
         "ADD_PHOTO",
-        "REMOVE_CURRENT_PHOTO",
+        "REMOVE_CURRENT_PHOTO_LABEL",
         "CHOOSE_FROM_LIBRARY",
         "TAKE_PHOTO",
         "CANCEL",
@@ -92,7 +93,7 @@ export class UtilService {
       case 'profile':
         buttons = [
           {
-            text: texts["REMOVE_CURRENT_PHOTO"],
+            text: texts["REMOVE_CURRENT_PHOTO_LABEL"],
             type: 'remove',
             action: 'remove'
           },
@@ -106,7 +107,7 @@ export class UtilService {
       case 'session':
         buttons = [
            {
-            text: texts["REMOVE_CURRENT_PHOTO"],
+            text: texts["REMOVE_CURRENT_PHOTO_LABEL"],
             type: 'remove',
             action: 'remove'
           },
diff --git a/src/app/pages/auth/login/login.page.ts b/src/app/pages/auth/login/login.page.ts
index 61a0c36db..964f0f835 100644
--- a/src/app/pages/auth/login/login.page.ts
+++ b/src/app/pages/auth/login/login.page.ts
@@ -2,7 +2,6 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { MenuController } from '@ionic/angular';
 import { TranslateService } from '@ngx-translate/core';
-import { localKeys } from 'src/app/core/constants/localStorage.keys';
 import { AuthService, LocalStorageService } from 'src/app/core/services';
 import { DynamicFormComponent, JsonFormData } from 'src/app/shared/components/dynamic-form/dynamic-form.component';
 import { CommonRoutes } from 'src/global.routes';
diff --git a/src/app/pages/create-session/create-session.page.html b/src/app/pages/create-session/create-session.page.html
index 5e1096a98..af2eb4269 100644
--- a/src/app/pages/create-session/create-session.page.html
+++ b/src/app/pages/create-session/create-session.page.html
@@ -1,53 +1,56 @@
 <app-page-header [config]="headerConfig"></app-page-header>
-<div class="height">
-  <ion-segment (ionChange)="segmentChanged($event)" [value]="type">
-    <ion-segment-button value="default" layout="icon-start">
-      <div class="icon-2">1</div>
-      <ion-label>{{ firstStepperTitle | translate}}</ion-label>
-    </ion-segment-button>
-    <ion-segment-button value="segment"  [disabled]="!isSubmited" layout="icon-start">
-      <div class="icon-2">2</div>
-      <ion-label>{{"MEETING_LINK" | translate}}</ion-label>
-    </ion-segment-button>
-  </ion-segment>
-  <div class="height" [ngSwitch]="type">
-    <ion-list class="height" *ngSwitchCase="'default'">
-      <ion-content class="ion-padding">
-        <app-profile-image *ngIf="showForm" [profileImageData]='profileImageData' [uploadImage]="true" (imageUploadEvent)="imageUploadEvent($event)" (imageRemoveEvent)="imageRemoveEvent($event)"></app-profile-image>
-        <div *ngIf="formData && showForm">
-          <app-dynamic-form [jsonFormData]="formData" #form1 (formValid)="isValid($event)"> </app-dynamic-form>
-        </div>
-      </ion-content>
-    </ion-list>
-    <ion-list class="height" *ngSwitchCase="'segment'">
-      <ion-card>
-        <ion-card-header>
-          <ion-card-title class="ion-text-center card-title">{{"SELECT_MEETING_PLATFORM" | translate}}</ion-card-title>
-        </ion-card-header>
-        <ion-card-content>
-          <ion-list>
-            <ion-select #link class="select" [(ngModel)]="selectedLink" interface="popover" (ionChange)="clickOptions($event)" [compareWith]="compareWithFn" [value]="selectedLink">
-              <ion-select-option [value]="option" *ngFor="let option of meetingPlatforms">
-                {{ option.name }}
-              </ion-select-option>
-            </ion-select>
-            <ion-item lines="none">
-              <ion-icon class="hint-icon" name="alert-circle"></ion-icon>
-              <ion-label class="hint-label">{{selectedHint}}</ion-label>
-            </ion-item>
-          </ion-list>
-          <div *ngFor="let option of meetingPlatforms">
-            <app-dynamic-form *ngIf="selectedLink==option" [jsonFormData]=option.form #platformForm></app-dynamic-form>
-        </div>
-        </ion-card-content>
-      </ion-card>
-    </ion-list>
+<ion-content>
+  <div class="height">
+    <ion-segment (ionChange)="segmentChanged($event)" [value]="type">
+      <ion-segment-button value="default" layout="icon-start">
+        <div class="icon-2">1</div>
+        <ion-label>{{ firstStepperTitle | translate}}</ion-label>
+      </ion-segment-button>
+      <ion-segment-button value="segment"  [disabled]="!isSubmited" layout="icon-start">
+        <div class="icon-2">2</div>
+        <ion-label>{{"MEETING_LINK" | translate}}</ion-label>
+      </ion-segment-button>
+    </ion-segment>
+    <div class="height" [ngSwitch]="type">
+      <ion-list class="height" *ngSwitchCase="'default'">
+        <ion-content class="ion-padding">
+          <app-profile-image *ngIf="showForm" [profileImageData]='profileImageData' [uploadImage]="true" (imageUploadEvent)="imageUploadEvent($event)" (imageRemoveEvent)="imageRemoveEvent($event)"></app-profile-image>
+          <div *ngIf="formData && showForm">
+            <app-dynamic-form [jsonFormData]="formData" #form1 (formValid)="isValid($event)"> </app-dynamic-form>
+          </div>
+        </ion-content>
+      </ion-list>
+      <ion-list class="height" *ngSwitchCase="'segment'">
+        <ion-card  class="form-content">
+          <ion-card-header>
+            <ion-card-title class="ion-text-center card-title">{{"SELECT_MEETING_PLATFORM" | translate}}</ion-card-title>
+          </ion-card-header>
+          <ion-card-content>
+            <ion-list>
+              <ion-select #link class="select" [(ngModel)]="selectedLink" interface="popover" (ionChange)="clickOptions($event)" [compareWith]="compareWithFn" [value]="selectedLink">
+                <ion-select-option [value]="option" *ngFor="let option of meetingPlatforms">
+                  {{ option.name }}
+                </ion-select-option>
+              </ion-select>
+              <ion-item lines="none">
+                <ion-icon class="hint-icon" name="alert-circle"></ion-icon>
+                <ion-label class="hint-label">{{selectedHint}}</ion-label>
+              </ion-item>
+            </ion-list>
+            <div *ngFor="let option of meetingPlatforms">
+              <app-dynamic-form *ngIf="selectedLink==option" [jsonFormData]=option.form #platformForm></app-dynamic-form>
+          </div>
+          </ion-card-content>
+        </ion-card>
+      </ion-list>
+    </div>
   </div>
-</div>
+</ion-content>
 
 <section [ngClass]="{'btn-disabled': form1?.myForm.invalid , 'btn-valid':form1?.myForm.valid}">
   <div class="ion-no-border" submitButton>
-    <ion-button *ngIf="type == 'default'" expand="full" (click)="onSubmit()">{{'PUBLISH_AND_ADD_LINK' | translate}}</ion-button>
+    <ion-button *ngIf="type == 'default' && !id" expand="full" (click)="onSubmit()">{{'PUBLISH_AND_ADD_LINK' | translate}}</ion-button>
+    <ion-button *ngIf="type == 'default' && id" expand="full" (click)="onSubmit()">{{'SAVE' | translate}}</ion-button>
   </div>
   <div class="ion-no-border segment" submitButton *ngIf="type == 'segment'">
     <ion-button *ngIf="sessionDetails?.meetingInfo?.platform === 'OFF'" class="btns" size="default" fill="solid" (click)="setItLater()">{{'SET_IT_LATER' | translate}}</ion-button>
diff --git a/src/app/pages/create-session/create-session.page.scss b/src/app/pages/create-session/create-session.page.scss
index 8eed97edd..2ab53f39f 100644
--- a/src/app/pages/create-session/create-session.page.scss
+++ b/src/app/pages/create-session/create-session.page.scss
@@ -25,6 +25,7 @@ ion-label{
 }
 .btns{
     width: 100%;
+    background: var(--white) !important;
 }
 .icon-2{
     background: var(--ion-color-primary);
@@ -35,4 +36,8 @@ ion-label{
     display: flex;
     align-items: center;
     justify-content: center;
+}
+.form-content{
+    max-height: 100% !important;    
+    overflow-y: scroll !important;
 }
\ No newline at end of file
diff --git a/src/app/pages/create-session/create-session.page.ts b/src/app/pages/create-session/create-session.page.ts
index 2ccd1be05..3873dec37 100644
--- a/src/app/pages/create-session/create-session.page.ts
+++ b/src/app/pages/create-session/create-session.page.ts
@@ -83,13 +83,7 @@ export class CreateSessionPage implements OnInit {
       this.type = params?.get('type')? params?.get('type'): 'default';
       this.firstStepperTitle = (this.id) ? "EDIT_SESSION_LABEL":"CREATE_NEW_SESSION";
       if (this.id) {
-        let response = await this.sessionService.getSessionDetailsAPI(this.id);
-        this.sessionDetails= response;
-        this.profileImageData.image = response.image;
-        this.profileImageData.isUploaded = true;
-        response.startDate = moment.unix(response.startDate).format("YYYY-MM-DDTHH:mm");
-        response.endDate = moment.unix(response.endDate).format("YYYY-MM-DDTHH:mm");
-        this.preFillData(response);
+        this.getSessionDetailsUpdate()
       } else {
         this.showForm = true;
       }
@@ -99,6 +93,15 @@ export class CreateSessionPage implements OnInit {
     this.profileImageData.isUploaded = true;
     this.changeDetRef.detectChanges();
   }
+  async getSessionDetailsUpdate(){
+    let response = await this.sessionService.getSessionDetailsAPI(this.id);
+        this.sessionDetails= response;
+        this.profileImageData.image = response.image;
+        this.profileImageData.isUploaded = true;
+        response.startDate = moment.unix(response.startDate).format("YYYY-MM-DDTHH:mm");
+        response.endDate = moment.unix(response.endDate).format("YYYY-MM-DDTHH:mm");
+        this.preFillData(response);
+  }
 
   async getPlatformFormDetails() {
     let form = await this.form.getForm(PLATFORMS);
@@ -111,21 +114,22 @@ export class CreateSessionPage implements OnInit {
     if(this.type=='default'){
       if (!this.form1?.myForm.pristine || this.profileImageData.haveValidationError) {
         let texts: any;
-        this.translate.get(['SESSION_FORM_UNSAVED_DATA', 'EXIT', 'BACK']).subscribe(text => {
+        this.translate.get(['SESSION_FORM_UNSAVED_DATA', 'EXIT', 'CANCEL', 'EXIT_HEADER_LABEL']).subscribe(text => {
           texts = text;
         })
         const alert = await this.alert.create({
+          header: texts['EXIT_HEADER_LABEL'],
           message: texts['SESSION_FORM_UNSAVED_DATA'],
           buttons: [
             {
               text: texts['EXIT'],
-              cssClass: "alert-button",
+              cssClass: "alert-button-bg-white",
               role: 'exit',
               handler: () => { }
             },
             {
-              text: texts['BACK'],
-              cssClass: "alert-button-bg-white",
+              text: texts['CANCEL'],
+              cssClass: "alert-button-red",
               role: 'cancel',
               handler: () => { }
             }
@@ -160,7 +164,6 @@ export class CreateSessionPage implements OnInit {
         form.timeZone = timezone;
         this.form1.myForm.markAsPristine();
         let result = await this.sessionService.createSession(form, this.id);
-        this.id = this.id ? this.id : result._id;
         if (result) {
           this.sessionDetails = _.isEmpty(result) ? this.sessionDetails : result;
           this.isSubmited = true;
@@ -168,7 +171,11 @@ export class CreateSessionPage implements OnInit {
           this.headerConfig.label = this.id ? "EDIT_SESSION":"CREATE_NEW_SESSION";
           result.startDate = moment.unix(result.startDate).format("YYYY-MM-DDTHH:mm");
           result.endDate = moment.unix(result.endDate).format("YYYY-MM-DDTHH:mm");
-          this.router.navigate([CommonRoutes.CREATE_SESSION], { queryParams: { id: this.id , type: 'segment'}, replaceUrl: true });
+          if(!this.id && result._id){
+            this.router.navigate([CommonRoutes.CREATE_SESSION], { queryParams: { id: result._id , type: 'segment'}, replaceUrl: true });
+          }else {
+            this.type = 'segment';
+          }
         } else {
           this.profileImageData.image = this.lastUploadedImage;
           this.profileImageData.isUploaded = false;
@@ -207,7 +214,7 @@ export class CreateSessionPage implements OnInit {
   }
 
   preFillData(existingData) {
-    for(let j=0;j<this?.meetingPlatforms.length;j++){
+    for(let j=0;j<this?.meetingPlatforms?.length;j++){
       if( existingData.meetingInfo.platform == this?.meetingPlatforms[j].name){
          this.selectedLink = this?.meetingPlatforms[j];
          this.selectedHint = this.meetingPlatforms[j].hint;
@@ -216,8 +223,10 @@ export class CreateSessionPage implements OnInit {
         let password = this?.meetingPlatforms[j]?.form?.controls.find( (password:any) => password?.name == 'password')
         if(existingData.meetingInfo.link){
           obj.value = existingData?.meetingInfo?.link;
-          meetingId = existingData?.meetingInfo?.meta?.meetingId;
-          password = existingData?.meetingInfo?.meta?.password;
+        }
+        if(existingData?.meetingInfo?.meta?.meetingId){
+          meetingId.value = existingData?.meetingInfo?.meta?.meetingId;
+          password.value = existingData?.meetingInfo?.meta?.password;
         }
       }
     }
@@ -247,8 +256,11 @@ export class CreateSessionPage implements OnInit {
     this.profileImageData.isUploaded = true;
     this.profileImageData.haveValidationError = false;
   }
-  segmentChanged(event){
+  async segmentChanged(event){
     this.type = event.target.value;
+    if(this.id){
+      this.getSessionDetailsUpdate();
+    }
   }
   isValid(event){
     this.isSubmited = event;
diff --git a/src/app/pages/edit-profile/edit-profile.page.ts b/src/app/pages/edit-profile/edit-profile.page.ts
index eb3efe845..c4571a2e3 100644
--- a/src/app/pages/edit-profile/edit-profile.page.ts
+++ b/src/app/pages/edit-profile/edit-profile.page.ts
@@ -64,11 +64,10 @@ export class EditProfilePage implements OnInit, isDeactivatable {
   }
   async ngOnInit() {
     const response = await this.form.getForm(EDIT_PROFILE_FORM);
-    var result = await this.profileService.getProfileDetailsAPI();
-    this.profileImageData.image = result.image;
     this.profileImageData.isUploaded = true;
     this.formData = _.get(response, 'result.data.fields');
     this.userDetails =  await this.localStorage.getLocalData(localKeys.USER_DETAILS);
+    this.profileImageData.image = this.userDetails.image;
     this.preFillData(this.userDetails);
   }
 
@@ -76,23 +75,24 @@ export class EditProfilePage implements OnInit, isDeactivatable {
     if (!this.form1.myForm.pristine || !this.profileImageData.isUploaded) {
       let texts: any;
       this.translate
-        .get(['FORM_UNSAVED_DATA', 'CANCEL', 'OK'])
+        .get(['FORM_UNSAVED_DATA', 'CANCEL', 'OK', 'EXIT_HEADER_LABEL'])
         .subscribe((text) => {
           texts = text;
         });
       const alert = await this.alert.create({
+        header: texts['EXIT_HEADER_LABEL'],
         message: texts['FORM_UNSAVED_DATA'],
         buttons: [
           {
             text: texts['CANCEL'],
-            cssClass: 'alert-button',
+            cssClass: 'alert-button-bg-white',
             role: 'exit',
             handler: () => {},
           },
           {
             text: texts['OK'],
             role: 'cancel',
-            cssClass: 'alert-button-bg-white',
+            cssClass: 'alert-button-red',
             handler: () => {},
           },
         ],
diff --git a/src/app/pages/feedback/feedback.page.html b/src/app/pages/feedback/feedback.page.html
index 08ffc312c..ef175ad3d 100644
--- a/src/app/pages/feedback/feedback.page.html
+++ b/src/app/pages/feedback/feedback.page.html
@@ -8,10 +8,10 @@
 
 <ion-content [fullscreen]="true">
   <div *ngIf="isMentor" class="top-header">
-    <strong>{{"MENTOR_FEEDBACK_HEADER" | translate}}</strong>
+    <strong>{{"THANK_FOR_HOSTING" | translate}} '{{sessionTitle}}'! {{"HELP_US_IMPROVE" | translate}}</strong>
   </div>
   <div *ngIf="!isMentor" class="top-header">
-    <strong>{{"MENTEE_FEEDBACK_HEADER" | translate}}</strong>
+    <strong>{{"THANK_FOR_ATTENDING" | translate}} '{{sessionTitle}}' {{"BY" | translate}} '{{mentorName}}'! {{"HELP_US_IMPROVE" | translate}}</strong>
   </div>
 
   <div class="bottom-line"></div>
diff --git a/src/app/pages/feedback/feedback.page.ts b/src/app/pages/feedback/feedback.page.ts
index 914aaf593..ef1c058fd 100644
--- a/src/app/pages/feedback/feedback.page.ts
+++ b/src/app/pages/feedback/feedback.page.ts
@@ -24,6 +24,8 @@ export class FeedbackPage implements OnInit {
   };
   sessionData: any;
   isMentor: boolean;
+  mentorName: any;
+  sessionTitle: any;
   constructor(private sessionService: SessionService,
     private toast: ToastService,
     private router: Router,
@@ -39,6 +41,8 @@ export class FeedbackPage implements OnInit {
   async isMentorChecking() {
     let userDetails = await this.localStorage.getLocalData(localKeys.USER_DETAILS);
     var response = await this.sessionService.getSessionDetailsAPI(this.sessionData._id);
+    this.mentorName = response.mentorName;
+    this.sessionTitle = response.title;
     this.isMentor = userDetails?._id == response?.userId ? true : false;
     this.formData.controls = this.sessionData.form;
     this.feedbackData.feedbackAs = this.isMentor ? "mentor" : "mentee";
diff --git a/src/app/pages/help/help.page.scss b/src/app/pages/help/help.page.scss
index 6dd93be88..f1114c429 100644
--- a/src/app/pages/help/help.page.scss
+++ b/src/app/pages/help/help.page.scss
@@ -15,4 +15,10 @@
   }
   .input{
       margin-top: 10px;
+  }
+  ion-select::part(text) {
+    color: var(--black);
+  }
+  .select {
+    padding: unset;
   }
\ No newline at end of file
diff --git a/src/app/pages/help/help.page.ts b/src/app/pages/help/help.page.ts
index d15221aad..35c6129b9 100644
--- a/src/app/pages/help/help.page.ts
+++ b/src/app/pages/help/help.page.ts
@@ -74,20 +74,22 @@ export class HelpPage implements OnInit {
   }
   async deteteAccount(){
     let texts: any;
-        this.translate.get(['DELETE_ALERT_MSG', 'YES', 'NO']).subscribe(text => {
+        this.translate.get(['DELETE_ALERT_MSG', 'YES', 'NO', 'DELETE_ACCOUNT']).subscribe(text => {
           texts = text;
         })
         const alert = await this.alert.create({
+          header: texts['DELETE_ACCOUNT'],
           message: texts['DELETE_ALERT_MSG'],
           buttons: [
             {
               text: texts['YES'],
-              cssClass: "alert-button",
+              cssClass: "alert-button-bg-white",
+              role: 'yes',
               handler: () => { }
             },
             {
               text: texts['NO'],
-              cssClass: "alert-button-bg-white",
+              cssClass: "alert-button",
               role: 'no',
               handler: () => { }
             }
@@ -95,7 +97,7 @@ export class HelpPage implements OnInit {
         });
         await alert.present();
         let data = await alert.onDidDismiss();
-      if(data.role == 'no'){
+      if(data.role == 'yes'){
         this.submitHelpReport();
       }
   }
@@ -108,7 +110,7 @@ export class HelpPage implements OnInit {
   }
   clickOptions(event:any){
     this.selectedOption.form = event.detail.value.form;
-    this.message = (this.userDetails.isAMentor) ? this.selectedOption?.menterMessage : this.selectedOption?.menteeMessage;
-    this.form1.createForm(this.selectedOption.form.controls);
+    this.message = (this.userDetails?.isAMentor) ? this.selectedOption?.menterMessage : this.selectedOption?.menteeMessage;
+    this.form1?.createForm(this.selectedOption.form.controls);
   }
 }
\ No newline at end of file
diff --git a/src/app/pages/home-search/home-search.page.html b/src/app/pages/home-search/home-search.page.html
index 710f9d718..a595ae582 100644
--- a/src/app/pages/home-search/home-search.page.html
+++ b/src/app/pages/home-search/home-search.page.html
@@ -1,7 +1,7 @@
 <app-page-header [config]="headerConfig"></app-page-header>
 <ion-content class="ion-padding">
   <ion-toolbar>
-    <ion-searchbar class="top-padding" [(ngModel)]="searchText" placeholder="" (ionInput)="checkInput()" debounce="100"></ion-searchbar>
+    <ion-searchbar class="top-padding" [(ngModel)]="searchText" placeholder="" (keypress)="checkInput($event)" debounce="100"></ion-searchbar>
   </ion-toolbar>
   <ion-segment (ionChange)="segmentChanged($event)" [value]="type">
     <ion-segment-button value="all-sessions">
diff --git a/src/app/pages/home-search/home-search.page.ts b/src/app/pages/home-search/home-search.page.ts
index f33b4bf08..5cbb405e3 100644
--- a/src/app/pages/home-search/home-search.page.ts
+++ b/src/app/pages/home-search/home-search.page.ts
@@ -53,8 +53,11 @@ export class HomeSearchPage implements OnInit {
     this.searching = false;
   }
 
-  checkInput(){
-    this.searchText=this.searchText.replace(/^ +/gm, '')
+  checkInput(event: any){
+    this.searchText=this.searchText.replace(/^ +/gm, '');
+    if(event.keyCode == 13){
+      this.search();
+    }
   }
 
   search(){
diff --git a/src/app/pages/session-detail/session-detail.page.html b/src/app/pages/session-detail/session-detail.page.html
index fdceb8812..e69fae671 100644
--- a/src/app/pages/session-detail/session-detail.page.html
+++ b/src/app/pages/session-detail/session-detail.page.html
@@ -22,7 +22,7 @@ <h6 class="title-font">{{detailData?.data?.title}}</h6>
 </ion-content>
 <ion-footer class="ion-no-border">
   <ion-item *ngIf="isCreator; else elseBlockFooter">
-      <ion-button *ngIf="detailData?.data?.status=='published' || detailData?.data?.status=='live'" [disabled]="!isEnabled" class="load-more-button" expand="full"
+      <ion-button *ngIf="detailData?.data?.status=='published' || detailData?.data?.status=='live'" [disabled]="!isEnabled || platformOff" class="load-more-button" expand="full"
       (click)="onStart(detailData?.data)">{{"START_SESSIONS" | translate}}</ion-button>
     
   </ion-item>
@@ -33,8 +33,8 @@ <h6 class="title-font">{{detailData?.data?.title}}</h6>
     <div *ngIf="detailData?.data?.isEnrolled && detailData?.data?.status==='published' && !isEnabled">
       <ion-button class="load-more-button" expand="full" (click)="onCancel()">{{"UN_ENROLL" | translate}}</ion-button>
     </div>
-    <div *ngIf="detailData?.data?.isEnrolled && detailData?.data?.status!='completed' && isEnabled">
-      <ion-button class="load-more-button" expand="full" (click)="onJoin()">{{"JOIN" | translate}}</ion-button>
+    <div *ngIf="detailData?.data?.isEnrolled && detailData?.data?.status!='completed' && isEnabled" class="join-button">
+      <ion-button class="load-more-button" expand="full" (click)="onJoin()" [disabled]="platformOff">{{"JOIN" | translate}}</ion-button>
     </div>
   </ng-template>
 </ion-footer>
\ No newline at end of file
diff --git a/src/app/pages/session-detail/session-detail.page.scss b/src/app/pages/session-detail/session-detail.page.scss
index 26f542ba8..0db0c3191 100644
--- a/src/app/pages/session-detail/session-detail.page.scss
+++ b/src/app/pages/session-detail/session-detail.page.scss
@@ -48,4 +48,7 @@ ion-item {
     --padding-end: 0px;
     --inner-padding-end: 0px;
     --padding-start: 0px;
-  }
\ No newline at end of file
+  }
+.join-button{
+    background: var(--white);
+}
\ No newline at end of file
diff --git a/src/app/pages/session-detail/session-detail.page.ts b/src/app/pages/session-detail/session-detail.page.ts
index d0800fef7..b9fa985d5 100644
--- a/src/app/pages/session-detail/session-detail.page.ts
+++ b/src/app/pages/session-detail/session-detail.page.ts
@@ -25,6 +25,9 @@ export class SessionDetailPage implements OnInit {
   endDate: any;
   sessionDatas: any;
   snackbarRef: any;
+  skipWhenDelete: boolean= false;
+  dismissWhenBack: boolean = false;
+  platformOff: any;
 
   constructor(private localStorage: LocalStorageService, private router: Router,
     private activatedRoute: ActivatedRoute, private sessionService: SessionService,
@@ -32,11 +35,11 @@ export class SessionDetailPage implements OnInit {
     this.id = this.activatedRoute.snapshot.paramMap.get('id')
   }
   ngOnInit() {
-    App.addListener('appStateChange', (state: AppState) => {
-      if (state.isActive == true) {
-        this.fetchSessionDetails();
-      }
-    });
+      App.addListener('appStateChange', (state: AppState) => {
+        if (state.isActive == true && this.id && this.sessionDatas && !this.dismissWhenBack) {
+          this.fetchSessionDetails();
+        }
+      });
   }
 
   async ionViewWillEnter() {
@@ -131,7 +134,7 @@ export class SessionDetailPage implements OnInit {
       let readableStartDate = moment.unix(response.startDate).toLocaleString();
       let currentTimeInSeconds=Math.floor(Date.now()/1000);
       if(response.isEnrolled){
-        this.isEnabled = ((response.startDate - currentTimeInSeconds) < 300 || response.status=='live') ? true : false
+        this.isEnabled = ((response.startDate - currentTimeInSeconds) < 600 || response.status=='live') ? true : false
       } else {
         this.isEnabled = ((response.startDate-currentTimeInSeconds)<600 || response.status=='live')?true:false;
       }
@@ -140,21 +143,23 @@ export class SessionDetailPage implements OnInit {
       this.detailData.data.meetingInfo = response.meetingInfo.platform;
       this.startDate = (response.startDate>0)?moment.unix(response.startDate).toLocaleString():this.startDate;
       this.endDate = (response.endDate>0)?moment.unix(response.endDate).toLocaleString():this.endDate;
+      this.platformOff = (response?.meetingInfo?.platform == 'OFF') ? true : false;
     }
-    if((response.meetingInfo.platform == 'OFF') && this.isCreator && response.status=='published'){
-    this.showToasts('ADD_MEETING_LINK', 0 , [
-        {
-          text: 'Add meeting link',
-          role: 'cancel',
-          handler: () => {
-            this.router.navigate([CommonRoutes.CREATE_SESSION], { queryParams: { id: this.id , type: 'segment'} });
+    if((response?.meetingInfo?.platform == 'OFF') && this.isCreator && response.status=='published'){
+      this.showToasts('ADD_MEETING_LINK', 0 , [
+          {
+            text: 'Add meeting link',
+            role: 'cancel',
+            handler: () => {
+              this.router.navigate([CommonRoutes.CREATE_SESSION], { queryParams: { id: this.id , type: 'segment'} });
+            }
           }
-        }
-      ])
-    }
+        ])
+    } 
+    this.dismissWhenBack = true;
   }
   ionViewWillLeave(){
-    this.snackbarRef = this.toaster.dismiss();
+    if(!this.skipWhenDelete){this.snackbarRef = this.toaster.dismiss()}
    }
 
   setPageHeader(response) {
@@ -216,8 +221,11 @@ export class SessionDetailPage implements OnInit {
       if (data) {
         let result = await this.sessionService.deleteSession(this.id);
         if (result.responseCode == "OK") {
+          this.skipWhenDelete= true;
+          this.id = null;
           this.toast.showToast(result.message, "success");
-          this._location.back();
+          this.router.navigate([`/${CommonRoutes.TABS}/${CommonRoutes.HOME}`], { replaceUrl: true });
+          this.snackbarRef = this.toaster.dismiss();
         }
       }
     }).catch(error => { })
@@ -254,8 +262,8 @@ export class SessionDetailPage implements OnInit {
     let msg = {
       header: 'CANCEL_SESSION',
       message: 'CANCEL_CONFIRM_MESSAGE',
-      cancel: 'CLOSE',
-      submit: 'CANCEL'
+      cancel: 'CANCEL',
+      submit: 'UN_ENROLL'
     }
     this.utilService.alertPopup(msg).then(async data => {
       if (data) {
diff --git a/src/app/pages/tabs/home/home.page.ts b/src/app/pages/tabs/home/home.page.ts
index b5109968a..c6001e679 100644
--- a/src/app/pages/tabs/home/home.page.ts
+++ b/src/app/pages/tabs/home/home.page.ts
@@ -57,13 +57,15 @@ export class HomePage implements OnInit {
 
   ngOnInit() {
     App.addListener('appStateChange', (state: AppState) => {
-      if (state.isActive == true) {
-        this.getSessions();
-        var obj = { page: this.page, limit: this.limit, searchText: "" };
-         this.sessionService.getAllSessionsAPI(obj).then((data)=>{
-            this.createdSessions = data;
-        })
-      }
+      this.localStorage.getLocalData(localKeys.USER_DETAILS).then(data => {
+        if (state.isActive == true && data) {
+          this.getSessions();
+          var obj = { page: this.page, limit: this.limit, searchText: "" };
+           this.sessionService.getAllSessionsAPI(obj).then((data)=>{
+              this.createdSessions = data;
+          })
+        }
+      })
     });
     this.getUser();
     this.userService.userEventEmitted$.subscribe(data => {
@@ -71,6 +73,7 @@ export class HomePage implements OnInit {
         this.user = data;
       }
     })
+    this.user = this.localStorage.getLocalData(localKeys.USER_DETAILS)
   }
   gotToTop() {
     this.content.scrollToTop(1000);
@@ -83,6 +86,7 @@ export class HomePage implements OnInit {
     this.createdSessions = await this.sessionService.getAllSessionsAPI(obj);
   }
   async eventAction(event) {
+    if(this.user.about){
     switch (event.type) {
       case 'cardSelect':
         (this.selectedSegment=="my-sessions")?this.router.navigate([`/${CommonRoutes.SESSIONS_DETAILS}/${event.data.sessionId}`]):this.router.navigate([`/${CommonRoutes.SESSIONS_DETAILS}/${event.data._id}`]);
@@ -108,6 +112,9 @@ export class HomePage implements OnInit {
         })
         break;
     }
+  }else {
+    this.router.navigate([`/${CommonRoutes.EDIT_PROFILE}`]);
+  }
   }
   viewMore(data) {
     this.router.navigate([`/${CommonRoutes.SESSIONS}`], { queryParams: { type: data } });
diff --git a/src/app/pages/tabs/mentor-directory/mentor-directory.page.html b/src/app/pages/tabs/mentor-directory/mentor-directory.page.html
index 33df616d3..5c3b0dfcf 100644
--- a/src/app/pages/tabs/mentor-directory/mentor-directory.page.html
+++ b/src/app/pages/tabs/mentor-directory/mentor-directory.page.html
@@ -17,6 +17,10 @@
   <div *ngIf="!mentors?.length">
     <app-no-data-found [messageHeader]="'NO_MENTORS_AVAILABLE'"> </app-no-data-found>
   </div>
+  <ion-infinite-scroll #infinitescroll [disabled]="mentors.length==0" (ionInfinite)="loadMore($event)">
+    <ion-infinite-scroll-content loadingSpinner="bubbles">
+    </ion-infinite-scroll-content>
+  </ion-infinite-scroll>
 </ion-content>
 <!-- <ion-footer *ngIf="mentors?.length">
   <ion-button class="view-more" expand="block" (click)="loadMore()"
diff --git a/src/app/pages/tabs/mentor-directory/mentor-directory.page.ts b/src/app/pages/tabs/mentor-directory/mentor-directory.page.ts
index d1e937ba8..e285f3dfd 100644
--- a/src/app/pages/tabs/mentor-directory/mentor-directory.page.ts
+++ b/src/app/pages/tabs/mentor-directory/mentor-directory.page.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
-import { IonContent } from '@ionic/angular';
+import { IonContent, IonInfiniteScroll } from '@ionic/angular';
 import { urlConstants } from 'src/app/core/constants/urlConstants';
 import {
   HttpService,
@@ -16,8 +16,10 @@ import { CommonRoutes } from 'src/global.routes';
 })
 export class MentorDirectoryPage implements OnInit {
   @ViewChild(IonContent) content: IonContent;
+  @ViewChild(IonContent) infinitescroll: IonInfiniteScroll;
+
   page = 1; //todo: Enable pagenation
-  limit = 100;
+  limit = 50;
   searchText: string = '';
   public headerConfig: any = {
     menu: true,
@@ -49,21 +51,27 @@ export class MentorDirectoryPage implements OnInit {
     this.content.scrollToTop(1000);
   }
 
-  async getMentors() {
-    await this.loaderService.startLoader();
+  async getMentors(showLoader = true) {
+    showLoader ? await this.loaderService.startLoader(): '';
     const config = {
       url: urlConstants.API_URLS.MENTORS_DIRECTORY + this.page + '&limit=' + this.limit + '&search=' + btoa(this.searchText),
       payload: {}
     };
     try {
       let data: any = await this.httpService.get(config);
-      this.loaderService.stopLoader();
-      console.log(data.result, "data.result");
-      this.mentors = this.mentors.concat(data.result.data);
+      showLoader ? await this.loaderService.stopLoader(): '';
+      if(this.mentors.length && this.mentors[this.mentors.length-1].key==data.result.data[0]?.key){
+        this.mentors[this.mentors.length-1].values = this.mentors[this.mentors.length-1].values.concat(data.result.data[0].values)
+        data.result.data.shift();
+        this.mentors = this.mentors.concat(data.result.data);
+      } else {
+        this.mentors = this.mentors.concat(data.result.data);
+      }
+      this.infinitescroll.disabled = this.mentorsCount == 0 ? true : false;
       this.mentorsCount = data.result.count;
     }
     catch (error) {
-      this.loaderService.stopLoader();
+      showLoader ? await this.loaderService.stopLoader(): '';
     }
   }
   eventAction(event) {
@@ -74,9 +82,10 @@ export class MentorDirectoryPage implements OnInit {
         break;
     }
   }
-  loadMore() {
+  async loadMore(event) {
     this.page = this.page + 1;
-    this.getMentors();
+    await this.getMentors(false);
+    event.target.complete();
   }
   onSearch() {
     this.page = 1;
diff --git a/src/app/pages/tabs/profile/profile.page.ts b/src/app/pages/tabs/profile/profile.page.ts
index 2fb01786d..cd244c722 100644
--- a/src/app/pages/tabs/profile/profile.page.ts
+++ b/src/app/pages/tabs/profile/profile.page.ts
@@ -72,36 +72,36 @@ export class ProfilePage implements OnInit {
   }
   async ionViewWillEnter() {
     this.user = await this.localStorage.getLocalData(localKeys.USER_DETAILS)
-    this.fetchProfileDetails();
+    this.formData.data = this.user;
+    this.formData.data.emailId = this.user.email.address;
+    if (this.formData?.data?.about) {
+      this.showProfileDetails = true;
+    } else {
+      (!this.visited && !this.formData.data.deleted)?this.router.navigate([CommonRoutes.EDIT_PROFILE]):null;
+      this.visited=true;
+    }
     this.gotToTop();
+    this.profileDetailsApi();
   }
 
   gotToTop() {
     this.content.scrollToTop(1000);
   }
 
-  async fetchProfileDetails() {
-    var response = await this.profileService.getProfileDetailsFromAPI(this.user.isAMentor,this.user._id);
-    this.formData.data = response;
-    this.formData.data.emailId = response.email.address;
-    if (this.formData?.data?.about) {
-      this.showProfileDetails = true;
-    } else {
-      (!this.visited)?this.router.navigate([CommonRoutes.EDIT_PROFILE]):null;
-      this.visited=true;
-    }
-  }
 
   async doRefresh(event){
-    var result = await this.profileService.getProfileDetailsFromAPI(this.user.isAMentor,this.user._id);
-    if(result){
-      this.formData.data = result;
-      this.formData.data.emailId = result.email.address;
-    }
+    this.profileDetailsApi();
     event.target.complete();
   }
 
   feedback() {
     this.navCtrl.navigateForward([CommonRoutes.FEEDBACK]);
   }
+  async profileDetailsApi(){
+    var result = await this.profileService.getProfileDetailsFromAPI(this.user?.isAMentor,this.user?._id);
+    if(result){
+      this.formData.data = result;
+      this.formData.data.emailId = result.email.address;
+    }
+  }
 }
diff --git a/src/app/pages/tabs/tabs.page.ts b/src/app/pages/tabs/tabs.page.ts
index b2966a340..5767403e7 100644
--- a/src/app/pages/tabs/tabs.page.ts
+++ b/src/app/pages/tabs/tabs.page.ts
@@ -12,7 +12,7 @@ export class TabsPage {
   subscription: any;
   constructor(private platform: Platform, private router: Router) { }
   tabChange(tabsRef: IonTabs) {
-    this.activeTab = tabsRef.outlet.activatedView.element;
+    this.activeTab = tabsRef?.outlet?.activatedView?.element;
   }
   ionViewWillLeave() {
     this.propagateToActiveTab('ionViewWillLeave');
diff --git a/src/app/pages/terms-and-conditions/terms-and-conditions.page.html b/src/app/pages/terms-and-conditions/terms-and-conditions.page.html
index a53df9ac0..45683c0ba 100644
--- a/src/app/pages/terms-and-conditions/terms-and-conditions.page.html
+++ b/src/app/pages/terms-and-conditions/terms-and-conditions.page.html
@@ -7,7 +7,7 @@
     <div>
       <ion-row class="d-flex, flex-align-items-center check-box-row">
         <ion-col class='d-flex flex-align-items-center flex-justify-start' size="1">
-          <ion-checkbox color='danger' (ionChange)='checked()'></ion-checkbox>
+          <ion-checkbox color='primary' (ionChange)='checked()'></ion-checkbox>
         </ion-col>
         <ion-col class='d-flex flex-align-items-center' size="11">
           <div>
diff --git a/src/app/shared/components/dynamic-form/dynamic-form.component.html b/src/app/shared/components/dynamic-form/dynamic-form.component.html
index 31b8f11a4..12bbbbd9f 100644
--- a/src/app/shared/components/dynamic-form/dynamic-form.component.html
+++ b/src/app/shared/components/dynamic-form/dynamic-form.component.html
@@ -50,6 +50,7 @@
         [value]="control.value"
         [maxlength]="control?.validators?.maxLength"
         (ionChange)="removeSpace($event)"
+        [placeholder]="control.platformPlaceHolder"
       ></ion-textarea>
       <ion-checkbox
         *ngIf="control.type === 'checkbox'"
diff --git a/src/app/shared/components/input-chip/input-chip.component.ts b/src/app/shared/components/input-chip/input-chip.component.ts
index 829a02023..d679b0bbf 100644
--- a/src/app/shared/components/input-chip/input-chip.component.ts
+++ b/src/app/shared/components/input-chip/input-chip.component.ts
@@ -117,6 +117,9 @@ export class InputChipComponent implements OnInit, ControlValueAccessor {
           name: 'chip',
           type: 'text',
           placeholder: 'Enter ' + `${this.lowerCaseLabel}`,
+          attributes: {
+            maxlength: 50,
+          }
         },
       ],
       buttons: [
diff --git a/src/app/shared/components/join-dialog-box/join-dialog-box.component.html b/src/app/shared/components/join-dialog-box/join-dialog-box.component.html
index b191b4d5f..8fed0baaf 100644
--- a/src/app/shared/components/join-dialog-box/join-dialog-box.component.html
+++ b/src/app/shared/components/join-dialog-box/join-dialog-box.component.html
@@ -10,7 +10,7 @@ <h5 class="join-header ellipsis">
         <ion-icon name="calendar-number-outline"></ion-icon>
       </ion-col>
       <ion-col class="d-flex flex-align-items-center" size="10" class="join-platform">
-          <ion-label>{{startDate | date: 'EEEE, MMMM d'}} . {{startDate | date:'hh:mm'}} - {{startDate | date:'shortTime'}}</ion-label>
+          <ion-label>{{startDate | date: 'EEEE, MMMM d'}} . {{startDate | date:'hh:mm'}} - {{endDate | date:'shortTime'}}</ion-label>
       </ion-col>
     </ion-row>
     <ion-row>
diff --git a/src/app/shared/components/session-card/session-card.component.ts b/src/app/shared/components/session-card/session-card.component.ts
index 83f87eeaf..7d4cd2481 100644
--- a/src/app/shared/components/session-card/session-card.component.ts
+++ b/src/app/shared/components/session-card/session-card.component.ts
@@ -67,8 +67,8 @@ export class SessionCardComponent implements OnInit {
     let value = {
       data: data,
       type:type
-    }
-    this.userData.about?this.onClickEvent.emit(value):this.router.navigate([`/${CommonRoutes.EDIT_PROFILE}`]);
+    };
+    this.onClickEvent.emit(value)
   }
   clickOnAddMeetingLink(cardData:any){
     let id = cardData._id;
diff --git a/src/app/shared/directive/onlyNumbers.ts b/src/app/shared/directive/onlyNumbers.ts
index d3d263710..e90696192 100644
--- a/src/app/shared/directive/onlyNumbers.ts
+++ b/src/app/shared/directive/onlyNumbers.ts
@@ -1,34 +1,28 @@
-import { Directive, ElementRef, HostListener } from '@angular/core';
+import { Directive, ElementRef, HostListener, Renderer2 } from '@angular/core';
 
 @Directive({
     selector: '[numberOnly]'
 })
 export class NumberOnlyDirective {
-    // Allow decimal numbers. The \. is only allowed once to occur
-    private regex: RegExp = new RegExp(/^[0-9]+(\.[0-9]*){0,1}$/g);
-
-    // Allow key codes for special events. Reflect :
-    // Backspace, tab, end, home
-    private specialKeys: Array<string> = [ 'Backspace', 'Tab', 'End', 'Home' ];
-
-    constructor(private el: ElementRef) {
+    private value: string;
+    constructor(
+        private elementRef: ElementRef,
+        private renderer: Renderer2
+    ) {
     }
 
-    @HostListener('keydown', [ '$event' ])
-    onKeyDown(event: KeyboardEvent) {
-        // Allow Backspace, tab, end, and home keys
-        if (this.specialKeys.indexOf(event.key) !== -1) {
-            return;
-        }
+    @HostListener('input', ['$event.target.value'])
+    onInputChange(value: string) {
+        const filteredValue: string = filterValue(value);
+        this.updateTextInput(filteredValue, this.value !== filteredValue);
+    }
 
-        // Do not use event.keycode this is deprecated.
-        // See: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/keyCode
-        let current: string = this.el.nativeElement.value;
-        // We need this because the current value on the DOM element
-        // is not yet updated with the value from this event
-        let next: string = current.concat(event.key);
-        if (next && !String(next).match(this.regex)) {
-            event.preventDefault();
-        }
+    private updateTextInput(value: string, propagateChange: boolean) {
+        this.renderer.setProperty(this.elementRef.nativeElement, 'value', value);
+        this.value = value;
     }
-}
\ No newline at end of file
+}
+
+function filterValue(value): string {
+    return value.replace(/[^0-9]*/g, '');
+}
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index a976bd0dd..08882a215 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -47,7 +47,7 @@
     "SIGN_UP_TO_MENTOR_ED":"Sign up to MentorED",
     "ADD":"Add",
     "CANCEL": "Cancel",
-    "CANCEL_SESSION":"Cancel Session",
+    "CANCEL_SESSION":"Unenroll session",
     "OK": "Ok",
     "LOG_IN":"Log In",
     "SHOW_PASSWORD":"Show password",
@@ -68,15 +68,15 @@
     "SORRY_NO_RESULTS":"Sorry no results found",
     "WELCOME_NOTE":"Search for top Mentors, enroll for live masterclass and enhance your learning.",
     "LOGOUT_CONFIRM_MESSAGE":"Are you sure you want to logout?",
-    "CANCEL_CONFIRM_MESSAGE":"Are you sure you want to cancel the session you have enrolled into?",
+    "CANCEL_CONFIRM_MESSAGE":"Are you sure you want to unenroll from this session?",
     "MENTORS_PROFILE":"Mentors Profile",
     "EDIT_PROFILE":"Edit profile",
     "ADD_PHOTO":"Add image",
-    "REMOVE_CURRENT_PHOTO":"Remove current photo",
+    "REMOVE_CURRENT_PHOTO":"Image removed successfully.",
     "CHOOSE_FROM_LIBRARY":"Choose from library",
     "TAKE_PHOTO":"Take Photo",
     "ERROR_WHILE_STORING_FILE":"Error while storing.",
-    "SUCCESSFULLY_ATTACHED":"Successfully uploaded.",
+    "SUCCESSFULLY_ATTACHED":"Image added successfully.",
     "NO_MENTORS_AVAILABLE":"No mentors available",
     "LOAD_MORE":"Load more",
     "MENTOR": "Mentor",
@@ -96,7 +96,7 @@
     "NO_DATA_AVAILABLE": "No data available",
     "CONFIRM":"Confirm",
     "FORM_UNSAVED_DATA":"You have unsaved data, please save your data before closing.",
-    "SESSION_FORM_UNSAVED_DATA": "Are you sure you want to exit? You will lose all data if you leave this page?",
+    "SESSION_FORM_UNSAVED_DATA": "Are you sure you want to exit? Your data will not be saved.",
     "SAVE":"Save",
     "TERMS_OF_USE": "Terms of use",
     "SOMETHING_WENT_WRONG":"Something went wrong",
@@ -181,7 +181,13 @@
     "HAVING_TROUBLE_LOGIN": "Having trouble in logging in/signing up? Write to us.",
     "ADD_MEETING_LINK": "Meeting link is not added, please add a link.",
     "DELETE_ACCOUNT": "Delete account",
-    "DELETE_ALERT_MSG": "Deleting your account will remove all your data from the app forever. You will have to create a new account if you decide to come back. Do you want to continue?",
+    "DELETE_ALERT_MSG": "Deleting your account will remove all your data from the MentorED forever. You will have to create a new account if you decide to come back. Do you want to continue?",
     "YES": "Yes",
-    "NO": "No"
+    "NO": "No",
+    "HELP_US_IMPROVE": "Please rate your experience to help us improve.",
+    "THANK_FOR_HOSTING": "Thank you for hosting",
+    "THANK_FOR_ATTENDING": "Thank you for attending",
+    "BY": "by",
+    "REMOVE_CURRENT_PHOTO_LABEL": "Remove current photo",
+    "EXIT_HEADER_LABEL": "Exit this page?"
 }
diff --git a/src/global.scss b/src/global.scss
index c9e26f676..a16e828cf 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -198,11 +198,10 @@ ion-button{
 
 .alert-button.sc-ion-alert-md {
   @extend.alert-button-global;
-  background-color: var(--ion-color-primary) !important;
-  color: var(--white) !important;
+  background-color: var(--ion-color-primary);
+  color: var(--white);
 } 
-.alert-button-bg-white.sc-ion-alert-md{
-  @extend.alert-button-global;
+.alert-button-bg-white{
   color: var(--ion-color-primary) !important;
   background-color: var(--white) !important;
 }