diff --git a/src/app/manage-learn/core/services/utils.service.ts b/src/app/manage-learn/core/services/utils.service.ts
index 6dc355f41..c0e51658b 100644
--- a/src/app/manage-learn/core/services/utils.service.ts
+++ b/src/app/manage-learn/core/services/utils.service.ts
@@ -521,9 +521,10 @@ export class UtilsService {
           ? this.requiredFields + " in"
           : ""
         }   your profile to access the feature.`,
+        cssClass:'central-alert',
       buttons: [
         {
-          text: "Update Profile",
+          text: "Update profile",
           role: "cancel",
           handler: blah => {
             this.router.navigate([`${RouterLinks.HOME}`], {replaceUrl:true});
diff --git a/src/app/manage-learn/project/add-programs/add-programs.component.html b/src/app/manage-learn/project/add-programs/add-programs.component.html
index c2f40b2ac..b93c1d18a 100644
--- a/src/app/manage-learn/project/add-programs/add-programs.component.html
+++ b/src/app/manage-learn/project/add-programs/add-programs.component.html
@@ -13,7 +13,7 @@
   <ion-list>
     <ion-radio-group>
       <ion-item *ngFor="let data of dataList">
-        <ion-label>{{data.name}}</ion-label>
+        <ion-label class="text-wrap">{{data.name}}</ion-label>
         <ion-radio slot="start" value="{{data._id}}" (click)="selectProgram(data)"></ion-radio>
       </ion-item>
     </ion-radio-group>
diff --git a/src/app/manage-learn/project/add-programs/add-programs.component.scss b/src/app/manage-learn/project/add-programs/add-programs.component.scss
index 2a78939bc..fb21ac20d 100644
--- a/src/app/manage-learn/project/add-programs/add-programs.component.scss
+++ b/src/app/manage-learn/project/add-programs/add-programs.component.scss
@@ -1,3 +1,6 @@
 .container {
     margin-top: env(safe-area-inset-top);
+  }
+  .text-wrap{
+    white-space: normal !important;
   }
\ No newline at end of file
diff --git a/src/app/manage-learn/project/attachment-listing/attachment-listing.page.ts b/src/app/manage-learn/project/attachment-listing/attachment-listing.page.ts
index 5b313f75a..4c03d0741 100644
--- a/src/app/manage-learn/project/attachment-listing/attachment-listing.page.ts
+++ b/src/app/manage-learn/project/attachment-listing/attachment-listing.page.ts
@@ -191,7 +191,7 @@ export class AttachmentListingPage implements OnInit {
     });
     const alert = await this.alert.create({
       cssClass: 'attachment-delete-alert',
-      message: data['FRMELEMNTS_LBL_ATTACHMENT_DELETE_CONFIRMATION'] + ' ' + this.selectedTab,
+      message: data['FRMELEMNTS_LBL_ATTACHMENT_DELETE_CONFIRMATION'] + ' ' + this.selectedTab + '?',
       buttons: [
         {
           text: data['YES'],
diff --git a/src/app/manage-learn/project/task-view/task-view.page.ts b/src/app/manage-learn/project/task-view/task-view.page.ts
index 6fa59b9c0..4c585b0dd 100644
--- a/src/app/manage-learn/project/task-view/task-view.page.ts
+++ b/src/app/manage-learn/project/task-view/task-view.page.ts
@@ -249,7 +249,7 @@ export class TaskViewPage {
   // task and project delete permission.
   async askPermissionToDelete(subtask, type) {
     let data;
-    this.translate.get(["FRMELEMNTS_LBL_DELETE_CONFIRMATION", "CANCEL", "BTN_SUBMIT"]).subscribe((text) => {
+    this.translate.get(["FRMELEMNTS_LBL_DELETE_CONFIRMATION", "NO", "YES"]).subscribe((text) => {
       data = text;
     });
     const alert = await this.alert.create({
@@ -257,13 +257,13 @@ export class TaskViewPage {
       cssClass: 'background-theme-color',
       buttons: [
         {
-          text: data["CANCEL"],
+          text: data["NO"],
           role: "cancel",
           cssClass: "secondary",
           handler: (blah) => { },
         },
         {
-          text: data["BTN_SUBMIT"],
+          text: data["YES"],
           handler: () => {
             this.delete(subtask);
           },
diff --git a/src/app/manage-learn/shared/components/date-type-input/date-type-input.component.html b/src/app/manage-learn/shared/components/date-type-input/date-type-input.component.html
index 42842a780..f92a3c1c5 100644
--- a/src/app/manage-learn/shared/components/date-type-input/date-type-input.component.html
+++ b/src/app/manage-learn/shared/components/date-type-input/date-type-input.component.html
@@ -1,6 +1,6 @@
 <ion-card class="_cardBg ion-padding">
   <ion-col class="_flex-box _justify-content-center _flex-direction-column">
-    <h4 [ngClass]="{'_validQuestion': data?.value}" class="flexbox">
+    <h4 [ngClass]="{'_validQuestion':( data?.value || !data?.validation?.required)}" class="flexbox">
       <app-question-heading [inputIndex]="inputIndex" [data]="data" [enableQuestionReadOut]="enableQuestionReadOut">
       </app-question-heading>
     </h4>
diff --git a/src/app/manage-learn/shared/components/text-type-input/text-type-input.component.html b/src/app/manage-learn/shared/components/text-type-input/text-type-input.component.html
index fe16e0128..61110338e 100644
--- a/src/app/manage-learn/shared/components/text-type-input/text-type-input.component.html
+++ b/src/app/manage-learn/shared/components/text-type-input/text-type-input.component.html
@@ -1,6 +1,6 @@
 <ion-card class="_cardBg ion-padding">
   <ion-col class="_flex-box _justify-content-center _flex-direction-column">
-    <h4 [ngClass]="{'_validQuestion': data?.value}" class="flexbox">
+    <h4 [ngClass]="{'_validQuestion': (data?.value || !data?.validation?.required)}" class="flexbox">
       <app-question-heading [inputIndex]="inputIndex" [data]="data" [enableQuestionReadOut]="enableQuestionReadOut">
       </app-question-heading>
     </h4>
diff --git a/src/app/manage-learn/submission-preview/submission-preview-page/submission-preview-page.component.html b/src/app/manage-learn/submission-preview/submission-preview-page/submission-preview-page.component.html
index fc1ac6898..031bead46 100644
--- a/src/app/manage-learn/submission-preview/submission-preview-page/submission-preview-page.component.html
+++ b/src/app/manage-learn/submission-preview/submission-preview-page/submission-preview-page.component.html
@@ -32,7 +32,7 @@ <h3 padding>{{ currentEvidence?.name }}</h3>
                 <h5 class="instacnce">{{ question?.instanceIdentifier }} {{ j + 1 }}</h5>
                 <div *ngFor="let answer of instance; let k = index" class="matrixQuestion">
                   <div *ngIf="answer?.value">
-                    <h3>Q{{ k + 1 }}. {{ answer?.question[0] }}</h3>
+                    <h3>{{ answer?.questionNumber}}. {{ answer?.question[0] }}</h3>
                     <p *ngIf="answer?.responseType !== 'radio' && answer?.responseType !== 'multiselect' && answer?.responseType !== 'date'">
                       Ans. {{ answer?.value }}
                     </p>
@@ -53,11 +53,11 @@ <h3>Q{{ k + 1 }}. {{ answer?.question[0] }}</h3>
               <div *ngFor="let answer of question.pageQuestions; let k = index" class="matrixQuestion">
                 <div *ngIf="answer?.responseType === 'matrix'; else notMatrix">
                   <div *ngIf="answer.value">
-                    <h3>Q{{ i + 1 }}. {{ answer?.question[0] }}</h3>
+                    <h3>{{ answer?.questionNumber}}. {{ answer?.question[0] }}</h3>
                     <div *ngFor="let instance of answer.value; let j = index" class="instanceQuest">
                       <h5 class="instacnce">{{ answer?.instanceIdentifier }} {{ j + 1 }}</h5>
                       <div *ngFor="let ans of instance; let k = index" class="matrixQuestion">
-                        <h3>Q{{ k + 1 }}. {{ ans?.question[0] }}</h3>
+                        <h3>{{ ans?.questionNumber}}.  {{ ans?.question[0] }}</h3>
                         <p *ngIf="ans?.responseType !== 'radio' && ans?.responseType !== 'multiselect' && ans?.responseType !== 'date'">
                           Ans. {{ ans?.value }}
                         </p>
@@ -76,7 +76,7 @@ <h3>Q{{ k + 1 }}. {{ ans?.question[0] }}</h3>
                 </div>
                 <ng-template #notMatrix>
                   <div class="instanceQuest" *ngIf="answer?.value">
-                    <h5>Q{{ k + 1 }}. {{ answer?.question[0] }}</h5>
+                    <h5>{{ answer?.questionNumber}}. {{ answer?.question[0] }}</h5>
                     <p *ngIf="answer?.responseType !== 'radio' && answer?.responseType !== 'multiselect' && answer?.responseType !== 'date'">
                       Ans. {{ answer?.value }}
                     </p>