diff --git a/Common-UI b/Common-UI
index 27a185b..bc6c63e 160000
--- a/Common-UI
+++ b/Common-UI
@@ -1 +1 @@
-Subproject commit 27a185ba15fbefd6333683f5a6bf8495b837f3af
+Subproject commit bc6c63e14dce0649fe6f7c0c1de665ce49955680
diff --git a/pom.xml b/pom.xml
index 7c8e092..8c3ff41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.iemr.aam-inventory-ui</groupId>
 	<artifactId>aam-inventory-ui</artifactId>
-	<version>3.6.0</version>
+	<version>3.6.1</version>
 	<name>AAM-Inventory-UI</name>
 	<description>Piramal - inventory: Module ui</description>
 	<packaging>war</packaging>
diff --git a/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/manual-indent-dispense/manual-indent-dispense.component.ts b/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/manual-indent-dispense/manual-indent-dispense.component.ts
index 13fd33b..ec0a269 100644
--- a/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/manual-indent-dispense/manual-indent-dispense.component.ts
+++ b/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/manual-indent-dispense/manual-indent-dispense.component.ts
@@ -136,6 +136,13 @@ export class ManualIndentDispenseComponent implements OnInit, DoCheck {
           console.log('Batch list response', batchlistResponse);
           this.batchlist = batchlistResponse.data;
           console.log('this.batchList', this.batchlist);
+          if (this.batchlist.length === 0) {
+            this.confirmationService.alert(
+              this.currentLanguageSet.noBatchesAvailable,
+              'error',
+            );
+            return;
+          } 
           this.openSelectBatchDialog(
             selectedItem,
             this.batchlist,
diff --git a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.html b/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.html
index 3fded14..46b20a7 100644
--- a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.html
+++ b/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.html
@@ -231,7 +231,9 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
                 <button
                   mat-mini-fab
                   color="primary"
-                  (click)="addToindentItemList(); trackFieldInteraction('Add Button')"
+                  (click)="
+                    addToindentItemList(); trackFieldInteraction('Add Button')
+                  "
                 >
                   <mat-icon>add</mat-icon>
                 </button>
@@ -266,7 +268,10 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
             class="pull-right m-r-5 mat_green"
             *ngIf="!editMode"
             [disabled]="indentRequestForm.invalid"
-            (click)="submitIndentRequest(indentRequestForm); trackFieldInteraction('Save Button')"
+            (click)="
+              submitIndentRequest(indentRequestForm);
+              trackFieldInteraction('Save Button')
+            "
           >
             {{ currentLanguageSet?.common?.save }}
           </button>
@@ -277,7 +282,10 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
             *ngIf="editMode"
             class="pull-right m-r-5 mat_green"
             [disabled]="indentRequestForm.invalid"
-            (click)="updateIndentRequest(indentRequestForm); trackFieldInteraction('Update Button')"
+            (click)="
+              updateIndentRequest(indentRequestForm);
+              trackFieldInteraction('Update Button')
+            "
           >
             {{ currentLanguageSet?.inventory?.update }}
           </button>
@@ -288,7 +296,9 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
             color="primary"
             class="pull-right m-r-5"
             [disabled]="indentRequestForm.pristine"
-            (click)="resetIndentRequestForm(); trackFieldInteraction('Clear Button')"
+            (click)="
+              resetIndentRequestForm(); trackFieldInteraction('Clear Button')
+            "
           >
             {{ currentLanguageSet?.inventory?.clear }}
           </button>
diff --git a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/sub-store-indent-order-worklist.component.html b/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/sub-store-indent-order-worklist.component.html
index d824373..7009ff1 100644
--- a/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/sub-store-indent-order-worklist.component.html
+++ b/src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/sub-store-indent-order-worklist.component.html
@@ -9,7 +9,9 @@ <h4>{{ currentLanguageSet?.inventory?.subStoreIndentOrderWorklist }}</h4>
         class="pull-right button-full-width"
         type="button"
         color="primary"
-        (click)="routeToRaiseRequest(); trackFieldInteraction('Raise Request Button')"
+        (click)="
+          routeToRaiseRequest(); trackFieldInteraction('Raise Request Button')
+        "
       >
         {{ currentLanguageSet?.inventory?.raiseRequest }}
       </button>
diff --git a/src/app/app-modules/inventory/medicine-dispense/medicine-dispense.component.html b/src/app/app-modules/inventory/medicine-dispense/medicine-dispense.component.html
index c50d8d3..af396ad 100644
--- a/src/app/app-modules/inventory/medicine-dispense/medicine-dispense.component.html
+++ b/src/app/app-modules/inventory/medicine-dispense/medicine-dispense.component.html
@@ -11,7 +11,9 @@ <h4 class="inline-block" style="font-size: larger">
         class="pull-right button-full-width m-l-5"
         type="button"
         color="primary"
-        (click)="openSearchDialog(); trackFieldInteraction('Advance Search Button')"
+        (click)="
+          openSearchDialog(); trackFieldInteraction('Advance Search Button')
+        "
       >
         {{ currentLanguageSet?.bendetails?.advanceSearch }}
       </button>
@@ -63,9 +65,7 @@ <h4 class="inline-block" style="font-size: larger">
                     !beneficiaryDetailForm.get('beneficiaryID')?.value
                   "
                   (selectionChange)="getVisitDetail()"
-                  (selectionChange)="
-                    trackFieldInteraction('Visit Code')
-                  "
+                  (selectionChange)="trackFieldInteraction('Visit Code')"
                 >
                   <mat-option
                     *ngFor="let visit of beneficiaryDetail"
diff --git a/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.css b/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.css
index 8fe7b28..7217cc9 100644
--- a/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.css
+++ b/src/app/app-modules/inventory/physical-stock-entry/physical-stock-entry.component.css
@@ -54,7 +54,29 @@
 .mat_form_field_background_color_table >>> .mdc-text-field--filled, .mdc-text-field--focused {
     /* background-color: #f9f9f9 !important; */
     background-color:unset !important;
+} 
+
+ /* floating label (NO blur) */
+.mat_form_field_background_color_table >>> 
+.mdc-text-field--filled.mdc-text-field--focused {
+    background-color: unset !important;
+}
+.mat_form_field_background_color_table >>> 
+.mdc-floating-label {
+    transform-origin: left top !important;
+    -webkit-font-smoothing: antialiased;
+    text-rendering: optimizeLegibility;
 }
+
+/* Float ABOVE without scaling */
+.mat_form_field_background_color_table >>> 
+.mdc-floating-label--float-above {
+    transform: translateY(-22px) !important;
+    font-size: 12px !important;   
+    line-height: 14px;
+    opacity: 1 !important;
+}
+
 .mat_form_field_background_color_table >>> .mdc-text-field{
     padding: unset !important;
 }
diff --git a/src/app/app-modules/inventory/reports/beneficiary-drug-issue-report/beneficiary-drug-issue-report.component.html b/src/app/app-modules/inventory/reports/beneficiary-drug-issue-report/beneficiary-drug-issue-report.component.html
index 6925390..2477773 100644
--- a/src/app/app-modules/inventory/reports/beneficiary-drug-issue-report/beneficiary-drug-issue-report.component.html
+++ b/src/app/app-modules/inventory/reports/beneficiary-drug-issue-report/beneficiary-drug-issue-report.component.html
@@ -24,7 +24,7 @@ <h4>{{ currentLanguageSet?.inventory?.beneficiaryDrugIssueReport }}</h4>
               (change)="checkEndDate()"
               [max]="maxEndDate"
               [disabled]="true"
-                (focus)="trackFieldInteraction('Start Date')"
+              (focus)="trackFieldInteraction('Start Date')"
             />
             <mat-datepicker-toggle
               matPrefix
@@ -49,7 +49,7 @@ <h4>{{ currentLanguageSet?.inventory?.beneficiaryDrugIssueReport }}</h4>
               [min]="minEndDate"
               [max]="maxEndDate"
               [disabled]="true"
-                (focus)="trackFieldInteraction('End Date')"
+              (focus)="trackFieldInteraction('End Date')"
             />
             <mat-datepicker-toggle
               matPrefix
@@ -58,21 +58,21 @@ <h4>{{ currentLanguageSet?.inventory?.beneficiaryDrugIssueReport }}</h4>
             <mat-datepicker [style.width]="'100%'" #pickerEnd></mat-datepicker>
           </mat-form-field>
         </div>
-        <div class="col-3" style="text-align:start;margin-top: 20px;">
+        <div class="col-3" style="text-align: start; margin-top: 20px">
           <button
             mat-raised-button
             class="mat_green"
             color="accent"
             type="submit"
             [disabled]="!beneficiaryDrugIssueForm.valid"
-            (click)="downloadReport(true); trackFieldInteraction('Download Button')"
+            (click)="
+              downloadReport(true); trackFieldInteraction('Download Button')
+            "
           >
             {{ currentLanguageSet?.inventory?.download }}
           </button>
         </div>
       </form>
     </div>
-
-    
   </div>
 </div>
diff --git a/src/app/app-modules/inventory/reports/consumption-report/consumption-report.component.html b/src/app/app-modules/inventory/reports/consumption-report/consumption-report.component.html
index 4615241..1889499 100644
--- a/src/app/app-modules/inventory/reports/consumption-report/consumption-report.component.html
+++ b/src/app/app-modules/inventory/reports/consumption-report/consumption-report.component.html
@@ -84,7 +84,9 @@ <h4>{{ currentLanguageSet?.inventory?.consumptionReport }}</h4>
             class="mat_green"
             type="submit"
             [disabled]="!consumptionForm.valid"
-            (click)="downloadReport(true); trackFieldInteraction('Download Button')"
+            (click)="
+              downloadReport(true); trackFieldInteraction('Download Button')
+            "
           >
             {{ currentLanguageSet?.inventory?.download }}
           </button>
diff --git a/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.html b/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.html
index a6e19bf..be680f4 100644
--- a/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.html
+++ b/src/app/app-modules/inventory/reports/daily-stock-details-report/daily-stock-details-report.component.html
@@ -85,7 +85,9 @@ <h4>{{ currentLanguageSet?.inventory?.dailyStockDetailsReport }}</h4>
             class="mat_green"
             type="submit"
             [disabled]="!dailyStockDetailsForm.valid"
-            (click)="downloadReport(true); trackFieldInteraction('Download Button')"
+            (click)="
+              downloadReport(true); trackFieldInteraction('Download Button')
+            "
           >
             {{ currentLanguageSet?.inventory?.download }}
           </button>
diff --git a/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.html b/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.html
index 9576a9c..1b3bdd8 100644
--- a/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.html
+++ b/src/app/app-modules/inventory/reports/daily-stock-summary-report/daily-stock-summary-report.component.html
@@ -81,7 +81,9 @@ <h4>{{ currentLanguageSet?.inventory?.dailyStockSummaryReport }}</h4>
           type="submit"
           class="mat_green"
           [disabled]="!dailyStockSummaryForm.valid"
-          (click)="downloadReport(true); trackFieldInteraction('Download Button')"
+          (click)="
+            downloadReport(true); trackFieldInteraction('Download Button')
+          "
         >
           {{ currentLanguageSet?.inventory?.download }}
         </button>
diff --git a/src/app/app-modules/inventory/reports/expiry-report/expiry-report.component.html b/src/app/app-modules/inventory/reports/expiry-report/expiry-report.component.html
index 13be292..788ded4 100644
--- a/src/app/app-modules/inventory/reports/expiry-report/expiry-report.component.html
+++ b/src/app/app-modules/inventory/reports/expiry-report/expiry-report.component.html
@@ -65,7 +65,9 @@ <h4>{{ currentLanguageSet?.inventory?.expiryReport }}</h4>
             type="submit"
             class="mat_green"
             [disabled]="!expiryForm.valid"
-            (click)="downloadReport(true); trackFieldInteraction('Download Button')"
+            (click)="
+              downloadReport(true); trackFieldInteraction('Download Button')
+            "
           >
             {{ currentLanguageSet?.inventory?.download }}
           </button>
diff --git a/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.css b/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.css
index bad2176..e536358 100644
--- a/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.css
+++ b/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.css
@@ -1,7 +1,20 @@
-/* CSS files should not be empty SonarQube Bug Fix */
+/* Fix for overlapping at different zoom levels */
+.mat_form_field_background_width {
+    width: 100% !important;
+}
 
+.input-full-width {
+    width: 100% !important;
+}
 
-.mat_form_field_background_width>>>.mat-mdc-text-field-wrapper {
-    width: 125% !important;
+/* Ensure Material form field doesn't overflow */
+::ng-deep .mat_form_field_background_width .mat-mdc-text-field-wrapper {
+    width: 100% !important;
+    max-width: 100% !important;
 }
 
+/* Add some spacing between columns to prevent overlap */
+.row > [class*='col-'] {
+    padding-left: 8px;
+    padding-right: 8px;
+}
\ No newline at end of file
diff --git a/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.html b/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.html
index ed0013d..32187e6 100644
--- a/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.html
+++ b/src/app/app-modules/inventory/reports/inward-stock-report/inward-stock-report.component.html
@@ -1,94 +1,84 @@
-<div class="container-fluid">
-  <div class="row m-t-10">
-    <div class="col-xs-12 col-sm-6">
-      <h4>{{ currentLanguageSet?.inventory?.inwardStockReport }}</h4>
-    </div>
-  </div>
-
-  <div class="m-b-10">
-    <div class="col-12">
-      <form [formGroup]="inwardStockForm" class="row">
-        <div class="col-3">
-          <mat-form-field
-            class="input-full-width mat_form_field_background_width"
-          >
-            <mat-label>
-              {{ currentLanguageSet?.inventory?.startDate }}
-            </mat-label>
-            <input
-              matInput
-              [matDatepicker]="picker"
-              name="startDate"
-              id="startDate"
-              formControlName="startDate"
-              (change)="checkEndDate()"
-              [max]="maxEndDate"
-              [disabled]="true"
-              (focus)="trackFieldInteraction('Start Date')"
-            />
-            <mat-datepicker-toggle
-              matSuffix
-              [for]="picker"
-            ></mat-datepicker-toggle>
-            <mat-datepicker [style.width]="'100%'" #picker></mat-datepicker>
-          </mat-form-field>
-        </div>
-        <div class="col-3">
-          <mat-form-field
-            class="input-full-width mat_form_field_background_width"
-          >
-            <mat-label>
-              {{ currentLanguageSet?.inventory?.endDate }}
-            </mat-label>
-            <input
-              matInput
-              [matDatepicker]="pickerEnd"
-              name="endDate"
-              id="endDate"
-              formControlName="endDate"
-              [min]="minEndDate"
-              [max]="maxEndDate"
-              [disabled]="true"
-              (focus)="trackFieldInteraction('End Date')"
-            />
-            <mat-datepicker-toggle
-              matSuffix
-              [for]="pickerEnd"
-            ></mat-datepicker-toggle>
-            <mat-datepicker [style.width]="'100%'" #pickerEnd></mat-datepicker>
-          </mat-form-field>
-        </div>
-        <div class="col-3">
-          <mat-form-field
-            class="input-full-width mat_form_field_background_width"
-          >
-            <mat-label>
-              {{ currentLanguageSet?.inventory?.facility }}
-            </mat-label>
-            <mat-select
-              [style.width]="'100%'"
-              formControlName="facilityName"
-              (selectionChange)="trackFieldInteraction('Facility')"
-            >
-              <mat-option *ngFor="let item of facilities" [value]="item">{{
-                item
-              }}</mat-option>
-            </mat-select>
-          </mat-form-field>
-        </div>
-        <div class="col-3" style="text-align: start; margin-top: 20px">
-          <button
-            mat-raised-button
-            color="accent"
-            class="mat_green"
-            type="submit"
-            [disabled]="!inwardStockForm.valid"
-            (click)="downloadReport(true); trackFieldInteraction('Download Button')"
+<div class="m-b-10">
+  <div class="col-12">
+    <form [formGroup]="inwardStockForm" class="row g-2">
+      <div class="col-12 col-md-6 col-lg-3">
+        <mat-form-field class="w-75">
+          <mat-label>
+            {{ currentLanguageSet?.inventory?.startDate }}
+          </mat-label>
+          <input
+            matInput
+            [matDatepicker]="picker"
+            name="startDate"
+            id="startDate"
+            formControlName="startDate"
+            (change)="checkEndDate()"
+            [max]="maxEndDate"
+            [disabled]="true"
+            (focus)="trackFieldInteraction('Start Date')"
+          />
+          <mat-datepicker-toggle
+            matSuffix
+            [for]="picker"
+          ></mat-datepicker-toggle>
+          <mat-datepicker #picker></mat-datepicker>
+        </mat-form-field>
+      </div>
+      <div class="col-12 col-md-6 col-lg-3">
+        <mat-form-field class="w-75">
+          <mat-label>
+            {{ currentLanguageSet?.inventory?.endDate }}
+          </mat-label>
+          <input
+            matInput
+            [matDatepicker]="pickerEnd"
+            name="endDate"
+            id="endDate"
+            formControlName="endDate"
+            [min]="minEndDate"
+            [max]="maxEndDate"
+            [disabled]="true"
+            (focus)="trackFieldInteraction('End Date')"
+          />
+          <mat-datepicker-toggle
+            matSuffix
+            [for]="pickerEnd"
+          ></mat-datepicker-toggle>
+          <mat-datepicker #pickerEnd></mat-datepicker>
+        </mat-form-field>
+      </div>
+      <div class="col-12 col-md-6 col-lg-3">
+        <mat-form-field class="w-75">
+          <mat-label>
+            {{ currentLanguageSet?.inventory?.facility }}
+          </mat-label>
+          <mat-select
+            formControlName="facilityName"
+            (selectionChange)="trackFieldInteraction('Facility')"
           >
-            {{ currentLanguageSet?.inventory?.download }}
-          </button>
-        </div>
-      </form>
-    </div>
+            <mat-option *ngFor="let item of facilities" [value]="item">{{
+              item
+            }}</mat-option>
+          </mat-select>
+        </mat-form-field>
+      </div>
+      <div
+        class="col-3"
+        style="display: flex; align-items: flex-end; padding-bottom: 20px"
+      >
+        <button
+          mat-raised-button
+          color="accent"
+          class="mat_green w-50"
+          type="submit"
+          [disabled]="!inwardStockForm.valid"
+          (click)="
+            downloadReport(true); trackFieldInteraction('Download Button')
+          "
+        >
+          {{ currentLanguageSet?.inventory?.download }}
+        </button>
+      </div>
+    </form>
   </div>
 </div>
diff --git a/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.html b/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.html
index b86cec4..2693039 100644
--- a/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.html
+++ b/src/app/app-modules/inventory/reports/monthly-report/monthly-report.component.html
@@ -70,7 +70,9 @@ <h4>{{ currentLanguageSet?.inventory?.monthlyReport }}</h4>
             class="mat_green"
             type="submit"
             [disabled]="!monthlyForm.valid"
-            (click)="downloadReport(true); trackFieldInteraction('Download Button')"
+            (click)="
+              downloadReport(true); trackFieldInteraction('Download Button')
+            "
           >
             {{ currentLanguageSet?.inventory?.download }}
           </button>
diff --git a/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.html b/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.html
index 7c99011..7d3982e 100644
--- a/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.html
+++ b/src/app/app-modules/inventory/reports/short-expiry-report/short-expiry-report.component.html
@@ -8,9 +8,7 @@ <h4>{{ currentLanguageSet?.inventory?.shortExpiryReport }}</h4>
   <div class="m-b-10 col-12">
     <form [formGroup]="shortExpiryForm" class="row">
       <div class="col-3">
-        <mat-form-field
-          class="input-full-width "
-        >
+        <mat-form-field class="input-full-width">
           <mat-label>
             {{ currentLanguageSet?.inventory?.date }}
           </mat-label>
@@ -36,18 +34,19 @@ <h4>{{ currentLanguageSet?.inventory?.shortExpiryReport }}</h4>
           ></mat-datepicker>
         </mat-form-field>
       </div>
-      <div class="col-3" style="text-align: start;margin-top: 20px;">
+      <div class="col-3" style="text-align: start; margin-top: 20px">
         <button
           mat-raised-button
           color="accent"
           class="mat_green"
           type="submit"
-          (click)="downloadReport(true); trackFieldInteraction('Download Button')"
+          (click)="
+            downloadReport(true); trackFieldInteraction('Download Button')
+          "
         >
           {{ currentLanguageSet?.inventory?.download }}
         </button>
       </div>
     </form>
-    
   </div>
 </div>
diff --git a/src/app/app-modules/inventory/reports/transit-report/transit-report.component.html b/src/app/app-modules/inventory/reports/transit-report/transit-report.component.html
index 562426d..076adb3 100644
--- a/src/app/app-modules/inventory/reports/transit-report/transit-report.component.html
+++ b/src/app/app-modules/inventory/reports/transit-report/transit-report.component.html
@@ -9,7 +9,7 @@ <h4>{{ currentLanguageSet?.inventory?.transitReport }}</h4>
     <form [formGroup]="transitForm" class="col-12 row">
       <div class="col-3">
         <mat-form-field
-          class="input-full-width  mat_form_field_background_width"
+          class="input-full-width mat_form_field_background_width"
         >
           <mat-label>
             {{ currentLanguageSet?.inventory?.startDate }}
@@ -57,19 +57,20 @@ <h4>{{ currentLanguageSet?.inventory?.transitReport }}</h4>
           <mat-datepicker [style.width]="'100%'" #pickerEnd></mat-datepicker>
         </mat-form-field>
       </div>
-      <div class="col-3" style="text-align:start;margin-top: 20px;">
+      <div class="col-3" style="text-align: start; margin-top: 20px">
         <button
           mat-raised-button
           color="accent"
           class="mat_green"
           type="submit"
           [disabled]="!transitForm.valid"
-          (click)="downloadReport(true); trackFieldInteraction('Download Button')"
+          (click)="
+            downloadReport(true); trackFieldInteraction('Download Button')
+          "
         >
           {{ currentLanguageSet?.inventory?.download }}
         </button>
       </div>
     </form>
-    
   </div>
 </div>
diff --git a/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.html b/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.html
index 89b31b9..65b2811 100644
--- a/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.html
+++ b/src/app/app-modules/inventory/reports/yearly-report/yearly-report.component.html
@@ -9,7 +9,7 @@ <h4>{{ currentLanguageSet?.inventory?.yearlyReport }}</h4>
     <div class="col-12">
       <form [formGroup]="yearlyForm" class="row">
         <div class="col-3">
-          <mat-form-field class="mat_form_field_background_width ">
+          <mat-form-field class="mat_form_field_background_width">
             <mat-label>
               {{ currentLanguageSet?.inventory?.selectyear }}
             </mat-label>
@@ -28,7 +28,7 @@ <h4>{{ currentLanguageSet?.inventory?.yearlyReport }}</h4>
           </mat-form-field>
         </div>
         <div class="col-3">
-          <mat-form-field class="mat_form_field_background_width ">
+          <mat-form-field class="mat_form_field_background_width">
             <mat-label>
               {{ currentLanguageSet?.inventory?.facility }}
             </mat-label>
@@ -44,14 +44,16 @@ <h4>{{ currentLanguageSet?.inventory?.yearlyReport }}</h4>
             </mat-select>
           </mat-form-field>
         </div>
-        <div class="col-3" style="text-align:start;margin-top: 20px;">
+        <div class="col-3" style="text-align: start; margin-top: 20px">
           <button
             mat-raised-button
             color="accent"
             class="mat_green"
             type="submit"
             [disabled]="!yearlyForm.valid"
-            (click)="downloadReport(true); trackFieldInteraction('Download Button')"
+            (click)="
+              downloadReport(true); trackFieldInteraction('Download Button')
+            "
           >
             {{ currentLanguageSet?.inventory?.download }}
           </button>
@@ -59,7 +61,5 @@ <h4>{{ currentLanguageSet?.inventory?.yearlyReport }}</h4>
         <!-- </div> -->
       </form>
     </div>
-
-   
   </div>
 </div>
diff --git a/src/app/app-modules/inventory/store-self-consumption/store-self-consumption.component.html b/src/app/app-modules/inventory/store-self-consumption/store-self-consumption.component.html
index 7093ec2..1408654 100644
--- a/src/app/app-modules/inventory/store-self-consumption/store-self-consumption.component.html
+++ b/src/app/app-modules/inventory/store-self-consumption/store-self-consumption.component.html
@@ -227,7 +227,10 @@ <h4 style="font-size: larger">
                   <mat-icon
                     class="icon-remove cursorPointer"
                     matTooltip="{{ currentLanguageSet?.inventory?.delete }}"
-                    (click)="removeDispensedStock(i, element); trackFieldInteraction('Delete Button')"
+                    (click)="
+                      removeDispensedStock(i, element);
+                      trackFieldInteraction('Delete Button')
+                    "
                     >delete</mat-icon
                   >
                 </td>
@@ -248,7 +251,9 @@ <h4 style="font-size: larger">
                 type="button"
                 class="pull-right"
                 color="primary"
-                (click)="addDispensedStock(); trackFieldInteraction('Add Button')"
+                (click)="
+                  addDispensedStock(); trackFieldInteraction('Add Button')
+                "
               >
                 <mat-icon>add</mat-icon>
               </button>
@@ -265,7 +270,9 @@ <h4 style="font-size: larger">
           mat-raised-button
           class="pull-right m-r-5"
           [disabled]="storeSelfConsumptionForm.invalid"
-          (click)="saveSelfConsumptionStock(); trackFieldInteraction('Save Button')"
+          (click)="
+            saveSelfConsumptionStock(); trackFieldInteraction('Save Button')
+          "
         >
           {{ currentLanguageSet?.common?.save }}
         </button>
diff --git a/src/app/app-modules/inventory/store-stock-adjustment/store-stock-adjustment.component.html b/src/app/app-modules/inventory/store-stock-adjustment/store-stock-adjustment.component.html
index f3b6825..61cbb15 100644
--- a/src/app/app-modules/inventory/store-stock-adjustment/store-stock-adjustment.component.html
+++ b/src/app/app-modules/inventory/store-stock-adjustment/store-stock-adjustment.component.html
@@ -366,7 +366,10 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
                   <mat-icon
                     class="icon-remove cursorPointer"
                     matTooltip="{{ currentLanguageSet?.inventory?.delete }}"
-                    (click)="removeFromStockAdjustmentList(i, stock); trackFieldInteraction('Delete Button')"
+                    (click)="
+                      removeFromStockAdjustmentList(i, stock);
+                      trackFieldInteraction('Delete Button')
+                    "
                     >delete</mat-icon
                   >
                 </td>
@@ -389,7 +392,10 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
                 mat-mini-fab
                 type="button"
                 color="primary"
-                (click)="addToStockAdjustmentList(); trackFieldInteraction('Add Button')"
+                (click)="
+                  addToStockAdjustmentList();
+                  trackFieldInteraction('Add Button')
+                "
               >
                 <mat-icon>add</mat-icon>
               </button>
@@ -418,7 +424,10 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
           mat-raised-button
           class="pull-right m-r-5"
           [disabled]="storeStockAdjustmentForm.invalid"
-          (click)="submitStockAdjustmentFinal(storeStockAdjustmentForm); trackFieldInteraction('Save Button')"
+          (click)="
+            submitStockAdjustmentFinal(storeStockAdjustmentForm);
+            trackFieldInteraction('Save Button')
+          "
         >
           {{ currentLanguageSet?.common?.save }}
         </button>
@@ -427,7 +436,10 @@ <h5 style="float: right; font-size: medium; padding-top: 12px">
           mat-raised-button
           class="pull-right m-r-5"
           [disabled]="storeStockAdjustmentForm.invalid"
-          (click)="submitStockAdjustmentDraft(storeStockAdjustmentForm); trackFieldInteraction('Save Draft Button')"
+          (click)="
+            submitStockAdjustmentDraft(storeStockAdjustmentForm);
+            trackFieldInteraction('Save Draft Button')
+          "
         >
           {{ currentLanguageSet?.inventory?.saveDraft }}
         </button>
diff --git a/src/app/app-modules/inventory/store-stock-transfer/store-stock-transfer.component.html b/src/app/app-modules/inventory/store-stock-transfer/store-stock-transfer.component.html
index 5109bf2..e1433f5 100644
--- a/src/app/app-modules/inventory/store-stock-transfer/store-stock-transfer.component.html
+++ b/src/app/app-modules/inventory/store-stock-transfer/store-stock-transfer.component.html
@@ -47,24 +47,21 @@ <h4 style="font-size: larger">
           />
         </mat-form-field>
       </div>
-      <div
-        class="col-xs-12 col-sm-6 col-md-4 col-lg-3"
-      >
-      <mat-form-field class="mat_form_field_background_width">
-        <mat-label>{{ currentLanguageSet?.inventory?.transferTo }}</mat-label>
-        <mat-select
-        [style.width]="'100%'"
-        required="true"
-        formControlName="transferTo"
-        (selectionChange)="resetItemArray()"
-        (selectionChange)="trackFieldInteraction('Transfer To')"
-      >
-        <mat-option *ngFor="let store of filterStore" [value]="store">
-          {{ store.facilityName }}
-        </mat-option>
-      </mat-select>
-      </mat-form-field>
-       
+      <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
+        <mat-form-field class="mat_form_field_background_width">
+          <mat-label>{{ currentLanguageSet?.inventory?.transferTo }}</mat-label>
+          <mat-select
+            [style.width]="'100%'"
+            required="true"
+            formControlName="transferTo"
+            (selectionChange)="resetItemArray()"
+            (selectionChange)="trackFieldInteraction('Transfer To')"
+          >
+            <mat-option *ngFor="let store of filterStore" [value]="store">
+              {{ store.facilityName }}
+            </mat-option>
+          </mat-select>
+        </mat-form-field>
       </div>
     </div>
 
diff --git a/src/app/facility-selection/facility-selection.component.html b/src/app/facility-selection/facility-selection.component.html
index 077be98..6f0b35b 100644
--- a/src/app/facility-selection/facility-selection.component.html
+++ b/src/app/facility-selection/facility-selection.component.html
@@ -1,98 +1,154 @@
 <app-header [showRoles]="false"></app-header>
 
-<div class="container col-12" style="margin-top: 5%;margin-bottom: 5%;">
+<div class="container col-12" style="margin-top: 5%; margin-bottom: 5%">
   <section class="row">
     <div class="col-3"></div>
     <div class="col-6">
-      <form [formGroup]='facilityForm'>
-        <div class="mdTitle"> 
-          <img src="assets/images/Piramal-logo-login.png" alt="Logo" style="margin: auto auto;">
+      <form [formGroup]="facilityForm">
+        <div class="mdTitle">
+          <img
+            src="assets/images/Piramal-logo-login.png"
+            alt="Logo"
+            style="margin: auto auto"
+          />
         </div>
-            <div class="row">
-              <div class="col-xs-12 m-t-25">
-                <mat-radio-group name='isMainStore' formControlName="isMainStore" (change)='checkStores()' (change)='toContinue()'
-                  (change)="trackFieldInteraction('Type of Stores')">
-                  <h4><strong>{{currentLanguageSet?.inventory?.typeofStores}}</strong>
-                  <mat-radio-button color="primary" class="radio-btn" value="true"
-                    (click)="trackFieldInteraction('Main Store')">{{currentLanguageSet?.inventory?.mainStore}}</mat-radio-button>
-                  <mat-radio-button color="primary" class="radio-btn" value="false"
-                    (click)="trackFieldInteraction('Sub Store')">{{currentLanguageSet?.inventory?.subStore}}</mat-radio-button>
-                </h4>
-                </mat-radio-group>
-              </div>
-              <div class="col-xs-12 m-t-25">
-                <mat-form-field class="mat_form_field_background_width">
-                  <mat-label>{{ currentLanguageSet?.inventory?.facility }}</mat-label>
-                <mat-select
-                  [style.width]="'100%'"
-                  name="facility"
-                  formControlName="facility"
-                  (selectionChange)="getSubFacility()"
-                  (selectionChange)="toContinue()"
-                  (selectionChange)="trackFieldInteraction('Facility Dropdown')"
+        <div class="row">
+          <div class="col-xs-12 m-t-25">
+            <mat-radio-group
+              name="isMainStore"
+              formControlName="isMainStore"
+              (change)="checkStores()"
+              (change)="toContinue()"
+              (change)="trackFieldInteraction('Type of Stores')"
+            >
+              <h4>
+                <strong>{{
+                  currentLanguageSet?.inventory?.typeofStores
+                }}</strong>
+                <mat-radio-button
+                  color="primary"
+                  class="radio-btn"
+                  value="true"
+                  (click)="trackFieldInteraction('Main Store')"
+                  >{{
+                    currentLanguageSet?.inventory?.mainStore
+                  }}</mat-radio-button
                 >
-                  <mat-option
-                    *ngFor="let facility of facilities"
-                    [value]="facility"
-                  >
-                    {{ facility.facilityName }}
-                  </mat-option>
-                </mat-select>
-                </mat-form-field>
-                
-                <!-- <mat-select [style.width]="'100%'" name='facility' formControlName='facility' placeholder='{{currentLanguageSet?.inventory?.facility}}' (change)='getSubFacility()'
+                <mat-radio-button
+                  color="primary"
+                  class="radio-btn"
+                  value="false"
+                  (click)="trackFieldInteraction('Sub Store')"
+                  >{{
+                    currentLanguageSet?.inventory?.subStore
+                  }}</mat-radio-button
+                >
+              </h4>
+            </mat-radio-group>
+          </div>
+          <div class="col-xs-12 m-t-25">
+            <mat-form-field class="mat_form_field_background_width">
+              <mat-label>{{
+                currentLanguageSet?.inventory?.facility
+              }}</mat-label>
+              <mat-select
+                [style.width]="'100%'"
+                name="facility"
+                formControlName="facility"
+                (selectionChange)="getSubFacility()"
+                (selectionChange)="toContinue()"
+                (selectionChange)="trackFieldInteraction('Facility Dropdown')"
+              >
+                <mat-option
+                  *ngFor="let facility of facilities"
+                  [value]="facility"
+                >
+                  {{ facility.facilityName }}
+                </mat-option>
+              </mat-select>
+            </mat-form-field>
+
+            <!-- <mat-select [style.width]="'100%'" name='facility' formControlName='facility' placeholder='{{currentLanguageSet?.inventory?.facility}}' (change)='getSubFacility()'
                   (change)='toContinue()'>
                   <mat-option *ngFor='let facility of facilities' [value]='facility'>
                     {{facility.facilityName}}
                   </mat-option>
                 </mat-select> -->
-              </div>
-              <div class="col-xs-12">
-                <mat-form-field class="mat_form_field_background_width">
-                  <mat-label>{{ currentLanguageSet?.inventory?.subFacility }}</mat-label>
-                  <mat-select
+          </div>
+          <div class="col-xs-12">
+            <mat-form-field class="mat_form_field_background_width">
+              <mat-label>{{
+                currentLanguageSet?.inventory?.subFacility
+              }}</mat-label>
+              <mat-select
                 [style.width]="'100%'"
-                  name="subFacility"
-                  formControlName="subFacility"
-                  (selectionChange)='checkSubFacility()'
-                  (selectionChange)="toContinue()"
-                  (selectionChange)="trackFieldInteraction('Sub Facility Dropdown')"
-                  [disabled]="
-                    facilityForm.controls.isMainStore.value === 'true'
-                      ? true
-                      : false
-                  "
+                name="subFacility"
+                formControlName="subFacility"
+                (selectionChange)="checkSubFacility()"
+                (selectionChange)="toContinue()"
+                (selectionChange)="
+                  trackFieldInteraction('Sub Facility Dropdown')
+                "
+                [disabled]="
+                  facilityForm.controls.isMainStore.value === 'true'
+                    ? true
+                    : false
+                "
+              >
+                <mat-option
+                  *ngFor="let subFacility of subFacilities"
+                  [value]="subFacility"
                 >
-                  <mat-option
-                    *ngFor="let subFacility of subFacilities"
-                    [value]="subFacility"
-                  >
-                    {{ subFacility.facilityName }}
-                  </mat-option>
-                </mat-select>
-                </mat-form-field>
-                
-                <!-- <mat-select [style.width]="'100%'" name='subFacility' formControlName='subFacility' placeholder='{{currentLanguageSet?.inventory?.subFacility}}' (change)='checkSubFacility()'
+                  {{ subFacility.facilityName }}
+                </mat-option>
+              </mat-select>
+            </mat-form-field>
+
+            <!-- <mat-select [style.width]="'100%'" name='subFacility' formControlName='subFacility' placeholder='{{currentLanguageSet?.inventory?.subFacility}}' (change)='checkSubFacility()'
                   (change)='toContinue()' class="button-disabled" [disabled]='isMainStore'>
                   <mat-option *ngFor='let subFacility of subFacilities' [value]='subFacility'>
                     {{subFacility.facilityName}}
                   </mat-option>
                 </mat-select> -->
-              </div>
-            </div>
-            <div class="row m-t-10 m-b-10">
-              <div class="col-xs-12">
-                <button mat-raised-button color="primary" *ngIf="facilityForm.value.isMainStore !== 'false'" class="pull-right submit button-disabled" [disabled]="!facilityForm.value.facility"
-                  (click)="proceedFurther(); trackFieldInteraction('Continue Button (Main Store)')">{{currentLanguageSet?.inventory?.continue}}</button>
-                <button mat-raised-button color="primary" *ngIf="facilityForm.value.isMainStore === 'false'" class="pull-right submit button-disabled" [disabled]="!facilityForm.value.facility || !facilityForm.value.subFacility"
-                  (click)="proceedFurther(); trackFieldInteraction('Continue Button (Sub Store)')">{{currentLanguageSet?.inventory?.continue}}</button>
-              </div>
-            </div>
-          <!-- </md-card-content> -->
+          </div>
+        </div>
+        <div class="row m-t-10 m-b-10">
+          <div class="col-xs-12">
+            <button
+              mat-raised-button
+              color="primary"
+              *ngIf="facilityForm.value.isMainStore !== 'false'"
+              class="pull-right submit button-disabled"
+              [disabled]="!facilityForm.value.facility"
+              (click)="
+                proceedFurther();
+                trackFieldInteraction('Continue Button (Main Store)')
+              "
+            >
+              {{ currentLanguageSet?.inventory?.continue }}
+            </button>
+            <button
+              mat-raised-button
+              color="primary"
+              *ngIf="facilityForm.value.isMainStore === 'false'"
+              class="pull-right submit button-disabled"
+              [disabled]="
+                !facilityForm.value.facility || !facilityForm.value.subFacility
+              "
+              (click)="
+                proceedFurther();
+                trackFieldInteraction('Continue Button (Sub Store)')
+              "
+            >
+              {{ currentLanguageSet?.inventory?.continue }}
+            </button>
+          </div>
+        </div>
+        <!-- </md-card-content> -->
         <!-- </md-card> -->
       </form>
     </div>
   </section>
 </div>
 
-<app-footer></app-footer>
\ No newline at end of file
+<app-footer></app-footer>
diff --git a/src/assets/Assamese.json b/src/assets/Assamese.json
index 0e995c6..800da4e 100644
--- a/src/assets/Assamese.json
+++ b/src/assets/Assamese.json
@@ -392,6 +392,7 @@
 
         },
         "healthId":"হেল্থ আইডি",
+        "noBatchesAvailable": "নির্বাচিত আইটেমৰ বাবে কোনো বেচ উপলব্ধ নহয়",
         "sessionExpiredPleaseLogin": "Session expired. Please log in again to continue",
         "somethingWentWrong": "কিছু ভুল হৈছে"
     }
diff --git a/src/assets/English.json b/src/assets/English.json
index e9f4c0a..f5abc04 100644
--- a/src/assets/English.json
+++ b/src/assets/English.json
@@ -385,6 +385,7 @@
             "failedStock": "Failed Stock"
         },
         "healthId":"Health ID",
+        "noBatchesAvailable":"No batches available for the selected item",
         "sessionExpiredPleaseLogin": "Session expired. Please log in again to continue",
         "somethingWentWrong": "Something went wrong"
 
diff --git a/src/assets/Hindi.json b/src/assets/Hindi.json
index f3583bd..c12957e 100644
--- a/src/assets/Hindi.json
+++ b/src/assets/Hindi.json
@@ -389,6 +389,7 @@
             "failedStock": "विफल स्टॉक"
         },
         "healthId": "हेल्थ आईडी",
+        "noBatchesAvailable": "चयनित आइटम के लिए कोई बैच उपलब्ध नहीं है",
         "sessionExpiredPleaseLogin": "Session expired. Please log in again to continue",
         "somethingWentWrong": "कुछ गलत हो गया"
     }
diff --git a/src/assets/Kannada.json b/src/assets/Kannada.json
index bb32424..ae073e7 100644
--- a/src/assets/Kannada.json
+++ b/src/assets/Kannada.json
@@ -386,6 +386,7 @@
         },
         "healthId":"ಆರೋಗ್ಯ ಐಡಿ",
         "list": "ಪಟ್ಟಿ",
+        "noBatchesAvailable":"ಆಯ್ಕೆಮಾಡಿದ ಐಟಂಗೆ ಯಾವುದೇ ಬ್ಯಾಚ್ ಲಭ್ಯವಿಲ್ಲ",
         "sessionExpiredPleaseLogin": "ಸೆಷನ್ ಅವಧಿ ಮೀರಿದೆ. ಮುಂದುವರಿಸಲು ದಯವಿಟ್ಟು ಮತ್ತೆ ಲಾಗಿನ್ ಮಾಡಿ",
         "somethingWentWrong": "ಏನೋ ತಪ್ಪಾಗಿದೆ"
     }