diff --git a/src/app/app-modules/core/components/beneficiary-worklist/beneficiary-worklist.component.html b/src/app/app-modules/core/components/beneficiary-worklist/beneficiary-worklist.component.html
index adcdc7f0..9589a6cd 100644
--- a/src/app/app-modules/core/components/beneficiary-worklist/beneficiary-worklist.component.html
+++ b/src/app/app-modules/core/components/beneficiary-worklist/beneficiary-worklist.component.html
@@ -57,7 +57,7 @@
                     class="border-l-[3px] font-semibold"
                     [ngClass]="
                       row.benVisitNo === 1
-                        ? 'border-l-success'
+                        ? 'border-l-primary'
                         : 'border-l-warning'
                     ">
                     {{ serial(i) }}
@@ -149,7 +149,7 @@
           *ngIf="!footerStart && visitStatus"
           class="m-0 flex list-none items-center gap-5 p-0 text-[0.8125rem] text-muted-foreground">
           <li class="inline-flex items-center gap-1.5">
-            <span class="size-3 rounded bg-success"></span>
+            <span class="size-3 rounded bg-primary"></span>
             {{ firstVisitText }}
           </li>
           <li class="inline-flex items-center gap-1.5">
diff --git a/src/app/app-modules/lab/workarea/workarea.component.html b/src/app/app-modules/lab/workarea/workarea.component.html
index 154927c1..3e8a7c18 100644
--- a/src/app/app-modules/lab/workarea/workarea.component.html
+++ b/src/app/app-modules/lab/workarea/workarea.component.html
@@ -127,7 +127,8 @@
                                 ? true
                                 : false
                           ">
-                          {{ current_language_set?.coreComponents?.mandatory }}*
+                          {{ current_language_set?.coreComponents?.mandatory
+                          }}<span class="text-destructive">*</span>
                         </span>
 
                         <z-radio-group
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/covid-diagnosis/covid-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/covid-diagnosis/covid-diagnosis.component.html
index 326f9eb5..356240a4 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/covid-diagnosis/covid-diagnosis.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/covid-diagnosis/covid-diagnosis.component.html
@@ -7,7 +7,8 @@
       z-form-label
       for="doctorDiagnosis"
       class="rounded-md bg-muted px-3 py-2 text-sm font-semibold text-foreground">
-      {{ current_language_set?.doctorDiagnosis }}*
+      {{ current_language_set?.doctorDiagnosis
+      }}<span class="text-destructive">*</span>
     </label>
     <z-form-field class="w-full">
       <z-form-control>
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html
index 5a04ae5f..7b843f05 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html
@@ -2,7 +2,8 @@
   <z-card class="bg-muted/40">
     <z-card-header>
       <z-card-title
-        >{{ current_language_set?.casesheet?.provisionalDiag }}*</z-card-title
+        >{{ current_language_set?.casesheet?.provisionalDiag
+        }}<span class="text-destructive">*</span></z-card-title
       >
     </z-card-header>
 
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html
index 9dac9daf..0e714b7c 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html
@@ -4,7 +4,7 @@
       <div class="rounded-md bg-muted px-4 py-2">
         <p class="text-sm font-semibold text-foreground">
           {{ current_language_set?.casesheet?.provisionalDiag
-          }}<span *ngIf="enableProvisionalDiag">*</span>
+          }}<span *ngIf="enableProvisionalDiag" class="text-destructive">*</span>
         </p>
       </div>
 
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.html
index a7791d93..e24fa3d1 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.html
@@ -98,7 +98,7 @@
             <div
               *ngIf="suggestedChiefComplaintList[i]?.length"
               role="listbox"
-              class="absolute z-50 mt-1 max-h-60 w-full overflow-auto rounded-md border border-border bg-popover p-1 text-popover-foreground shadow-md">
+              class="absolute left-0 top-full z-50 mt-1 max-h-60 w-full overflow-auto rounded-md border border-border bg-popover p-1 text-popover-foreground shadow-md">
               <button
                 type="button"
                 role="option"
diff --git a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.html b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.html
index 1e8bfcac..baf272e6 100644
--- a/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.html
+++ b/src/app/app-modules/nurse-doctor/examination/general-opd-examination/general-examination/general-examination.component.html
@@ -379,7 +379,7 @@
       >{{
         currentLanguageSet?.ExaminationData?.ANC_OPD_PNCExamination
           ?.genExamination?.typeofEdema
-      }}*</label
+      }}<span class="text-destructive">*</span></label
     >
     <z-radio-group
       id="edemaType"
diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history-ncdscreening/family-history-ncdscreening.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history-ncdscreening/family-history-ncdscreening.component.html
index 38ee109f..3910de78 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history-ncdscreening/family-history-ncdscreening.component.html
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/family-history-ncdscreening/family-history-ncdscreening.component.html
@@ -49,7 +49,9 @@
               >{{
                 currentLanguageSet?.historyData?.ancHistory
                   ?.familyHistoryDataANC_OPD_NCD_PNC?.diseaseType
-              }}{{ age >= 30 ? ' *' : '' }}</label
+              }}<span class="text-destructive">{{
+                age >= 30 ? ' *' : ''
+              }}</span></label
             >
             <z-form-control>
               <z-select
@@ -106,10 +108,14 @@
           </z-form-field>
 
           <z-form-field class="gap-1.5">
-            <label z-form-label for="familyMembers-{{ i }}">{{
-              currentLanguageSet?.historyData?.ancHistory
-                ?.familyHistoryDataANC_OPD_NCD_PNC?.familyMember
-            }}</label>
+            <label z-form-label for="familyMembers-{{ i }}"
+              >{{
+                currentLanguageSet?.historyData?.ancHistory
+                  ?.familyHistoryDataANC_OPD_NCD_PNC?.familyMember
+              }}<span class="text-destructive">{{
+                age >= 30 ? ' *' : ''
+              }}</span></label
+            >
             <z-form-control>
               <z-select
                 class="w-full bg-background"
diff --git a/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html b/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html
index 6c63992d..dadf94bd 100644
--- a/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html
+++ b/src/app/app-modules/nurse-doctor/quick-consult/quick-consult.component.html
@@ -619,7 +619,8 @@
 
       <!-- ===================== PROVISIONAL DIAGNOSIS ===================== -->
       <p class="text-base font-semibold tracking-tight text-foreground">
-        {{ currentLanguageSet?.DiagnosisDetails?.provisionaldiagnosis }} *
+        {{ currentLanguageSet?.DiagnosisDetails?.provisionaldiagnosis
+        }} <span class="text-destructive">*</span>
       </p>
 
       <ng-container formArrayName="provisionalDiagnosisList">
diff --git a/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.html b/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.html
index f5b934c6..7988bf4b 100644
--- a/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.html
+++ b/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.html
@@ -46,8 +46,10 @@
     <!-- Referred to institute -->
     <div class="grid grid-cols-1 items-center gap-2 sm:grid-cols-2">
       <span class="text-sm font-medium text-foreground">
-        {{ currentLanguageSet?.Referdetails?.higherhealthcarecenter }}
-        {{ showMsg > 0 && instituteFlag === true ? '*' : '' }}
+        {{ currentLanguageSet?.Referdetails?.higherhealthcarecenter
+        }}<span class="text-destructive">{{
+          showMsg > 0 && instituteFlag === true ? ' *' : ''
+        }}</span>
       </span>
       <z-select
         class="w-full"
@@ -95,7 +97,11 @@
     <div class="grid grid-cols-1 items-start gap-2 sm:grid-cols-2">
       <span class="text-sm font-medium text-foreground">
         {{ currentLanguageSet?.Referdetails?.referralReason }}
-        <span *ngIf="referForm.get('referralReason')?.enabled">*</span>
+        <span
+          *ngIf="referForm.get('referralReason')?.enabled"
+          class="text-destructive"
+          >*</span
+        >
       </span>
       <z-form-field class="w-full">
         <z-form-control>
diff --git a/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.html b/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.html
index 9276c6e1..ab21b4d2 100644
--- a/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.html
+++ b/src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.html
@@ -38,7 +38,7 @@
             <div
               *ngIf="suggestedChiefComplaintList[i]?.length"
               role="listbox"
-              class="absolute z-50 mt-1 max-h-60 w-full overflow-auto rounded-md border border-border bg-popover p-1 text-popover-foreground shadow-md">
+              class="absolute left-0 top-full z-50 mt-1 max-h-60 w-full overflow-auto rounded-md border border-border bg-popover p-1 text-popover-foreground shadow-md">
               <button
                 type="button"
                 role="option"
diff --git a/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.html b/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.html
index 62b64d2c..68dcb554 100644
--- a/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.html
+++ b/src/app/app-modules/nurse-doctor/visit-details/travel-history/travel-history.component.html
@@ -2,7 +2,8 @@
   <div
     class="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
     <label z-form-label for="travelStatus">
-      {{ currentLanguageSet?.travel?.haveyouTravelledlast14days }} *
+      {{ currentLanguageSet?.travel?.haveyouTravelledlast14days
+      }} <span class="text-destructive">*</span>
     </label>
     <z-radio-group
       formControlName="travelStatus"
diff --git a/src/app/app-modules/nurse-doctor/vitals/cancer-patient-vitals/cancer-patient-vitals.component.html b/src/app/app-modules/nurse-doctor/vitals/cancer-patient-vitals/cancer-patient-vitals.component.html
index d3e85a36..14eba792 100644
--- a/src/app/app-modules/nurse-doctor/vitals/cancer-patient-vitals/cancer-patient-vitals.component.html
+++ b/src/app/app-modules/nurse-doctor/vitals/cancer-patient-vitals/cancer-patient-vitals.component.html
@@ -98,7 +98,7 @@
 
         <!-- BMI status markers (adult / no gender) -->
         <div
-          class="flex flex-col justify-center gap-1"
+          class="flex flex-col gap-1.5"
           *ngIf="
             (totalMonths !== undefined && totalMonths > 228) ||
             (totalMonths !== undefined &&
@@ -107,9 +107,15 @@
               !male &&
               !female)
           ">
-          <div
-            class="flex items-center gap-2 text-sm text-destructive"
-            *ngIf="BMI !== null && BMI < 18.5">
+          <!-- invisible label spacer: matches the sibling fields' label height so
+               the status badge lines up on the input's vertical center -->
+          <label z-form-label aria-hidden="true" class="invisible select-none"
+            >&nbsp;</label
+          >
+          <div class="flex min-h-9 flex-col justify-center gap-1">
+            <div
+              class="flex items-center gap-2 text-sm text-destructive"
+              *ngIf="BMI !== null && BMI < 18.5">
             <ng-icon name="lucideCircle" size="14"></ng-icon>
             <span>{{
               currentLanguageSet?.vitalsDetails
@@ -157,6 +163,7 @@
               >{{ currentLanguageSet?.pleaseConfirmClinically }}
             </span>
           </span>
+          </div>
         </div>
 
         <!-- BMI status markers (minor) -->
diff --git a/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.html b/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.html
index eb74fd1d..0e15d697 100644
--- a/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.html
+++ b/src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.html
@@ -164,10 +164,16 @@
               !male &&
               !female)
           ">
-          <div class="flex flex-col justify-end gap-1">
-            <div
-              class="flex items-center gap-1.5 text-sm text-destructive"
-              *ngIf="bMI !== null && bMI < 18.5">
+          <div class="flex flex-col gap-1.5">
+            <!-- invisible label spacer: matches the sibling fields' label height so
+                 the status badge lines up on the input's vertical center -->
+            <label z-form-label aria-hidden="true" class="invisible select-none"
+              >&nbsp;</label
+            >
+            <div class="flex min-h-9 flex-col justify-center gap-1">
+              <div
+                class="flex items-center gap-1.5 text-sm text-destructive"
+                *ngIf="bMI !== null && bMI < 18.5">
               <ng-icon name="lucideCircle" size="12"></ng-icon>
               <span>{{
                 currentLanguageSet?.vitalsDetails
@@ -215,6 +221,7 @@
                 currentLanguageSet?.pleaseConfirmClinically
               }}</span>
             </span>
+            </div>
           </div>
         </ng-template>
 
diff --git a/src/assets/English.json b/src/assets/English.json
index a906a228..6cd2be1e 100644
--- a/src/assets/English.json
+++ b/src/assets/English.json
@@ -259,7 +259,7 @@
       "bloodGlucoseTrend": "Blood Glucose Trends",
       "resultMammogram": "Results of Mammogram",
       "otherComplication": "Other Complication of Current Pregnancy",
-      "add": "add",
+      "add": "Add",
       "remove":"remove",
       "confirmDiagnosis": "Confirmatory Diagnosis",
       "labTest": "Test Report",
@@ -525,7 +525,7 @@
           "consanguineousMarriage": "H/o Consanguineous Marriage",
           "geneticDisorders": "Genetic Disorders",
           "previousFamilyHistory": "Previous Family History",
-          "pleaseSelectDiabetesMellitusInDiseaseType": "Please select Diabetes Mellitus in disease type"
+          "pleaseSelectDiabetesMellitusInDiseaseType": "Please select any NCD for proper screening"
         },
         "menstrualHistoryANC": {
           "menstrualHistory": "Menstrual History",
@@ -1186,10 +1186,10 @@
     "Prescription": {
       "form": "Form",
       "medicine": "Medicine",
-      "dosage": "dosage",
+      "dosage": "Dosage",
       "frequency": "Frequency",
       "unit": "Unit",
-      "Route": "route",
+      "Route": "Route",
       "instructions": "Instructions",
       "quantity": "Quantity",
       "isEDL": "IsEDL"