diff --git a/.env.example b/.env.example
index f4ec277f..682bbaf6 100644
--- a/.env.example
+++ b/.env.example
@@ -7,6 +7,6 @@ VUE_APP_PERMISSION_ID=
 VUE_APP_ALIAS={}
 VUE_APP_MAPPING_TYPES={"PO": "PO_MAPPING_PREF","RSTINV": "INV_MAPPING_PREF"}
 VUE_APP_MAPPING_PO={"orderId": { "label": "Order ID", "required": true }, "productSku": { "label": "Shopify product SKU", "required": true },"orderDate": { "label": "Arrival date", "required": true }, "quantity": { "label": "Ordered quantity", "required": true }, "facility": { "label": "Facility ID", "required": true }}
-VUE_APP_MAPPING_RSTINV={"productSku": { "label": "Product SKU", "required": true }, "quantity": { "label": "Quantity", "required": true }, "facility": { "label": "Facility ID", "required": true }, "locationSeqId": { "label": "Facility Location", "required": true }}
+VUE_APP_MAPPING_RSTINV={"productIdentification": { "label": "Product Identification", "required": true }, "quantity": { "label": "Quantity", "required": true }, "facility": { "label": "Facility ID", "required": true }}
 VUE_APP_DEFAULT_LOG_LEVEL="error"
 VUE_APP_LOGIN_URL="http://launchpad.hotwax.io/login"
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 55fb1c4a..20c07039 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "import",
-  "version": "2.13.0",
+  "version": "2.14.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "import",
-      "version": "2.13.0",
+      "version": "2.14.0",
       "dependencies": {
         "@capacitor/android": "^2.4.7",
         "@capacitor/core": "^2.4.7",
diff --git a/package.json b/package.json
index 0ad2329e..a303624b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "import",
-  "version": "2.13.0",
+  "version": "2.14.0",
   "private": true,
   "description": "Import App",
   "scripts": {
diff --git a/src/components/BulkInventoryAdjustmentModal.vue b/src/components/BulkInventoryAdjustmentModal.vue
deleted file mode 100644
index 1b33335c..00000000
--- a/src/components/BulkInventoryAdjustmentModal.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-<template>
-  <ion-header>
-    <ion-toolbar>
-      <ion-buttons slot="start">
-        <ion-button @click="closeModal"> 
-          <ion-icon :icon="close" />
-        </ion-button>
-      </ion-buttons>
-      <ion-title>{{ $t("Bulk adjustment") }}</ion-title>
-    </ion-toolbar>
-  </ion-header>
-
-  <ion-content>
-    <ion-list>
-      <ion-item lines="full">
-        <ion-input :label="$t('Buffer quantity')" v-model="quantityBuffer" type="number" min="0" :placeholder="$t('Quantity')" />
-      </ion-item>
-
-      <ion-item>
-        <ion-select :label="$t('Facility')" interface="popover" v-model="facilityId">
-          <ion-select-option v-for="facility in facilities" :key="facility.facilityId" :value="facility.facilityId">{{ facility.facilityName }}</ion-select-option>
-        </ion-select>
-      </ion-item>
-    </ion-list>
-
-    <ion-fab vertical="bottom" horizontal="end" slot="fixed">
-      <ion-fab-button @click="save">
-        <ion-icon :icon="saveOutline" />
-      </ion-fab-button>
-    </ion-fab>
-  </ion-content>
-</template>
-<script lang="ts">
-import { 
-  IonButtons,
-  IonButton,
-  IonContent,
-  IonFab,
-  IonFabButton,
-  IonHeader,
-  IonItem,
-  IonIcon,
-  IonInput,
-  IonList,
-  IonSelect,
-  IonSelectOption,
-  IonTitle,
-  IonToolbar,
-  modalController,
-} from "@ionic/vue";
-import { defineComponent } from "vue";
-import { close, saveOutline } from "ionicons/icons";
-import { useStore } from "@/store";
-import { mapGetters } from "vuex";
-import { showToast } from "@/utils";
-import { translate } from "@/i18n";
-export default defineComponent({
-  name: "BulkInventoryAdjustmentModal",
-  components: {
-    IonButtons,
-    IonButton,
-    IonContent,
-    IonFab,
-    IonFabButton,
-    IonHeader,
-    IonIcon,
-    IonItem,
-    IonInput,
-    IonList,
-    IonSelect,
-    IonSelectOption,
-    IonTitle,
-    IonToolbar 
-  },
-  data() {
-    return {
-      quantityBuffer: 0,
-      facilityId: "",
-    }
-  },
-  computed: {
-    ...mapGetters({
-      stockItems: 'stock/getStockItems',  
-      facilities: 'util/getFacilities',
-    })
-  },
-  methods: {
-    closeModal() {
-      modalController.dismiss({ dismissed: true });
-    },
-    async save() {
-      const facilityLocations = await this.store.dispatch('util/fetchFacilityLocations', [this.facilityId]);
-      const locationSeqId = facilityLocations[this.facilityId] && facilityLocations[this.facilityId][0] ? facilityLocations[this.facilityId][0].locationSeqId : '';
-      this.stockItems.parsed.map((item: any) => {
-        if (item.isSelected) {
-          item.quantity -= this.quantityBuffer;
-          if(this.facilityId) {
-            item.facilityId = this.facilityId;
-            item.externalFacilityId = "";
-            item.locationSeqId = locationSeqId;
-          }
-        }
-      })
-      await this.store.dispatch('stock/updateStockItems', this.stockItems)
-      this.closeModal();
-      showToast(translate("Changes have been successfully applied"));
-    },
-  },
-  setup() {
-    const store = useStore();
-    return {
-      close,
-      saveOutline,
-      store
-    };
-  },
-});
-</script>
\ No newline at end of file
diff --git a/src/components/ConfigureDateTimeFormatModal.vue b/src/components/ConfigureDateTimeFormatModal.vue
deleted file mode 100644
index 929afd72..00000000
--- a/src/components/ConfigureDateTimeFormatModal.vue
+++ /dev/null
@@ -1,153 +0,0 @@
-<!-- TODO: components inside this modal needs to be updated as per ionic 7 migration guide -->
-<template>
-  <ion-header>
-    <ion-toolbar>
-      <ion-buttons slot="start">
-        <ion-button @click="closeModal"> 
-          <ion-icon :icon="close" />
-        </ion-button>
-      </ion-buttons>
-      <ion-title>{{ $t("Configure date time format") }}</ion-title>
-    </ion-toolbar>
-  </ion-header>
-
-  <ion-content>
-    <ion-item>
-      <ion-label color="medium">{{ $t("CSV input") }}</ion-label>
-      <ion-label slot="end">{{ arrivalDate }}</ion-label>
-    </ion-item> 
-    <ion-item>
-      <ion-label color="medium">{{ $t("Expected input") }}</ion-label>
-      <ion-label slot="end">{{ currentDate }}</ion-label>
-    </ion-item>
-    <ion-item lines="full">
-      <ion-input :label="$t('Custom date format')" :clear-input='true' @keyup.enter="dateTimeFormat = $event.target.value;" v-model="dateTimeFormat" :value="dateTimeFormat" :placeholder="defaultDateTimeFormat" />
-    </ion-item>
-
-    <ion-item lines="none">
-      <a href="https://moment.github.io/luxon/#/formatting?id=table-of-tokens" target="_blank">{{ $t('View all date time formats supported by the HotWax Import app.') }}</a>
-    </ion-item>
-          
-    <ion-item class="ion-margin-top">
-      <ion-label color="medium">{{ $t("Parsed output") }}</ion-label>
-      <ion-label slot="end">{{ isDateInvalid(arrivalDate) ? $t("Invalid input") : arrivalDate }}</ion-label>
-      <ion-icon slot="end" color="danger" v-if="isDateInvalid(arrivalDate)" :icon="warningOutline"></ion-icon>
-    </ion-item>
-
-    <ion-item lines="none">
-      <ion-label class="ion-text-wrap" color="medium">
-        {{ $t("Changes to the date time format will cause edits done to your PO to be reverted.") }}
-      </ion-label>
-    </ion-item>
-
-    <ion-fab vertical="bottom" horizontal="end" slot="fixed">
-      <ion-fab-button @click="save()">
-        <ion-icon :icon="saveOutline" />
-      </ion-fab-button>
-    </ion-fab>
-  </ion-content>
-</template>
-
-<script lang="ts">
-import { 
-  IonButtons,
-  IonButton,
-  IonContent,
-  IonFab,
-  IonFabButton,
-  IonHeader,
-  IonItem,
-  IonIcon,
-  IonInput,
-  IonLabel,
-  IonTitle,
-  IonToolbar,
-  modalController,
-  alertController } from "@ionic/vue";
-import { defineComponent } from "vue";
-import { close, saveOutline, warningOutline } from "ionicons/icons";
-import { mapGetters } from 'vuex';
-import { DateTime } from 'luxon';
-import { useStore } from "@/store";
-
-export default defineComponent({
-  name: "ConfigureDateTimeFormatModal",
-  props: ["arrivalDate"],
-  data() {
-    return {
-      currentDate: '',
-      dateTimeFormat: '',
-      defaultDateTimeFormat: process.env.VUE_APP_DATE_FORMAT ? process.env.VUE_APP_DATE_FORMAT : 'MM/dd/yyyy'
-    }
-  },
-  computed: {
-    ...mapGetters({
-      currentDateTimeFormat: 'user/getPreferredDateTimeFormat'
-    })
-  },
-  mounted(){
-    this.dateTimeFormat = this.currentDateTimeFormat
-    this.currentDate = DateTime.now().toFormat(this.dateTimeFormat)
-  },
-  methods: {
-    closeModal() {
-      modalController.dismiss({ dismissed: true });
-    },
-    async save() {
-      const message = this.$t("Are you sure you want to change the date time format?");
-      const alert = await alertController.create({
-        header: this.$t("Update date time format"),
-        message,
-        buttons: [
-          {
-            text: this.$t("Cancel"),
-          },
-          {
-            text: this.$t("Confirm"),
-            handler: () => {
-              this.updateDateTimeFormat();
-            }
-          }
-        ],
-      });
-      return alert.present();
-    },
-    isDateInvalid(date: string) {
-      return !DateTime.fromFormat(date, this.dateTimeFormat).isValid
-    },
-    updateDateTimeFormat(){
-      this.dateTimeFormat = this.dateTimeFormat ? this.dateTimeFormat : this.defaultDateTimeFormat
-      this.store.dispatch('user/setPreferredDateTimeFormat', this.dateTimeFormat).then(() => this.closeModal());
-    },
-  },
-  setup() {
-    const store = useStore();
-    return {
-      close,
-      saveOutline,
-      store,
-      warningOutline
-    };
-  },
-  components: { 
-    IonButtons,
-    IonButton,
-    IonContent,
-    IonFab,
-    IonFabButton,
-    IonHeader,
-    IonIcon,
-    IonItem,
-    IonInput,
-    IonLabel,
-    IonTitle,
-    IonToolbar 
-    },
-});
-</script>
-
-<style scoped>
-a {
-  text-decoration: none;
-}
-</style>
\ No newline at end of file
diff --git a/src/components/CreateMappingModal.vue b/src/components/CreateMappingModal.vue
index b148aefb..59a7e103 100644
--- a/src/components/CreateMappingModal.vue
+++ b/src/components/CreateMappingModal.vue
@@ -18,9 +18,19 @@
     <div>
       <ion-list>
         <ion-item :key="field" v-for="(fieldValues, field) in getFields()">
-          <ion-select :label="$t(fieldValues.label)" interface="popover" :placeholder="$t('Select')" v-model="fieldMapping[field]">
-            <ion-select-option :key="index" v-for="(prop, index) in fileColumns">{{ prop }}</ion-select-option>
-          </ion-select>
+          <template v-if="field === 'productIdentification'">
+            <ion-select interface="popover" :placeholder = "$t('Select')" slot="start" v-model="identificationTypeId">
+              <ion-select-option :key="goodIdentificationType.goodIdentificationTypeId" v-for="goodIdentificationType in goodIdentificationTypes">{{ goodIdentificationType.description }}</ion-select-option>
+            </ion-select>
+            <ion-select interface="popover" v-if="content.length" :placeholder = "$t('Select')" slot="end" v-model="fieldMapping['productIdentification']">
+              <ion-select-option :key="index" v-for="(prop, index) in fileColumns">{{ prop }}</ion-select-option>
+            </ion-select>
+          </template>
+          <template v-else>
+            <ion-select :label="$t(fieldValues.label)" interface="popover" :placeholder = "$t('Select')" v-model="fieldMapping[field]">
+              <ion-select-option :key="index" v-for="(prop, index) in fileColumns">{{ prop }}</ion-select-option>
+            </ion-select>
+          </template>
         </ion-item>
       </ion-list>
     </div>
@@ -78,17 +88,20 @@ export default defineComponent({
     return {
       mappingName: "",
       fieldMapping: {} as any,
-      fileColumns: [] as any
+      fileColumns: [] as any,
+      identificationTypeId: 'SHOPIFY_PROD_SKU'
     }
   },
   props: ["content", "seletedFieldMapping", "mappingType"],
   mounted() {
     this.fieldMapping = { ...this.seletedFieldMapping }
     this.fileColumns = Object.keys(this.content[0]);
+    this.store.dispatch('util/fetchGoodIdentificationTypes');
   },
   computed: {
     ...mapGetters({
-      fieldMappings: 'user/getFieldMappings'
+      fieldMappings: 'user/getFieldMappings',
+      goodIdentificationTypes: 'util/getGoodIdentificationTypes'
     })
   },
   methods: {
diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index 0df28ddb..b4ad60cb 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -1,38 +1,38 @@
 <template>
-    <ion-menu content-id="main-content" type="overlay" :disabled="!isUserAuthenticated">
-        <ion-header>
-          <ion-toolbar>
-            <ion-title>{{ $t("Import")}}</ion-title>
-          </ion-toolbar>
-        </ion-header>
+  <ion-menu content-id="main-content" type="overlay" :disabled="!isUserAuthenticated">
+    <ion-header>
+      <ion-toolbar>
+        <ion-title>{{ $t("Import")}}</ion-title>
+      </ion-toolbar>
+    </ion-header>
 
-        <ion-content>
-          <ion-list id="import-list">
-            <ion-menu-toggle auto-hide="false" v-for="(p, i) in appPages" :key="i">
-              <ion-item
-                button
-                router-direction="root"
-                :router-link="p.url"
-                class="hydrated"
-                :class="{ selected: selectedIndex === i }">
-                <ion-icon slot="start" :ios="p.iosIcon" :md="p.mdIcon"></ion-icon>
-                <ion-label>{{ p.title }}</ion-label>
-              </ion-item>
-            </ion-menu-toggle>
-          </ion-list>
-        </ion-content>
+    <ion-content>
+      <ion-list id="import-list">
+        <ion-menu-toggle auto-hide="false" v-for="(p, i) in appPages" :key="i">
+          <ion-item
+            button
+            router-direction="root"
+            :router-link="p.url"
+            class="hydrated"
+            :class="{ selected: selectedIndex === i }">
+            <ion-icon slot="start" :ios="p.iosIcon" :md="p.mdIcon"></ion-icon>
+            <ion-label>{{ p.title }}</ion-label>
+          </ion-item>
+        </ion-menu-toggle>
+      </ion-list>
+    </ion-content>
 
-        <ion-footer>
-          <ion-toolbar>
-            <ion-item lines="none">
-              <ion-label class="ion-text-wrap">
-                <p class="overline">{{ instanceUrl }}</p>
-              </ion-label>
-              <ion-note slot="end">{{ userProfile?.userTimeZone }}</ion-note>
-            </ion-item>
-          </ion-toolbar>
-        </ion-footer>
-      </ion-menu>
+    <ion-footer>
+      <ion-toolbar>
+        <ion-item lines="none">
+          <ion-label class="ion-text-wrap">
+            <p class="overline">{{ instanceUrl }}</p>
+          </ion-label>
+          <ion-note slot="end">{{ userProfile?.userTimeZone }}</ion-note>
+        </ion-item>
+      </ion-toolbar>
+    </ion-footer>
+  </ion-menu>
 </template>
 
 <script lang="ts">
@@ -52,7 +52,6 @@ import {
 } from "@ionic/vue";
 import { computed, defineComponent } from "vue";
 import { mapGetters } from "vuex";
-
 import { albumsOutline, bookmarkOutline, settings, calendar } from "ionicons/icons";
 import { useStore } from "@/store";
 import { useRouter } from "vue-router";
diff --git a/src/components/MissingFacilitiesModal.vue b/src/components/MissingFacilitiesModal.vue
index 661d5cd0..1165ce59 100644
--- a/src/components/MissingFacilitiesModal.vue
+++ b/src/components/MissingFacilitiesModal.vue
@@ -55,6 +55,8 @@ import { useStore } from "@/store";
 import { mapGetters } from "vuex";
 import { showToast } from "@/utils";
 import { translate } from "@/i18n";
+import emitter from "@/event-bus";
+
 export default defineComponent({
   name: "MissingFacilitiesModal",
   components: {
@@ -95,7 +97,9 @@ export default defineComponent({
       if(this.type === 'order'){
         this.store.dispatch('order/updateMissingFacilities', this.facilityMapping)
       } else {
-        this.store.dispatch('stock/updateMissingFacilities', this.facilityMapping)
+        emitter.emit('presentLoader');
+        await this.store.dispatch('stock/updateMissingFacilities', this.facilityMapping)
+        emitter.emit('dismissLoader');
       }
       this.closeModal();
       showToast(translate("Changes have been successfully applied"));
diff --git a/src/locales/en.json b/src/locales/en.json
index a0cc2caa..b7222b36 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -84,12 +84,14 @@
   "Missing facilities": "Missing facilities",
   "Missing products": "Missing products",
   "Missing SKUs": "Missing SKUs",
+  "more items": "{remainingItemCount} more items",
   "New mapping": "New mapping",
   "New version available, please update the app.": "New version available, please update the app.",
   "There are no saved CSV mappings to show. Create a new mapping from a file upload screen": "There are no saved CSV mappings to show. Create a new mapping from a file upload screen",
   "No new file upload. Please try again": "No new file upload. Please try again",
   "No results found": "No results found",
   "No time zone found": "No time zone found",
+  "of": "of",
   "OMS": "OMS",
   "OMS instance": "OMS instance",
   "Only select": "Only select",
@@ -100,6 +102,7 @@
   "Parsed output": "Parsed output",
   "Password":  "Password",
   "Pending": "Pending",
+  "Please ensure that the uploaded file contains accurate product information. If a product does not exist, the corresponding records will not be processed.": "Please ensure that the uploaded file contains accurate product information. If a product does not exist, the corresponding records will not be processed.",
   "Please upload a valid purchase order csv to continue": "Please upload a valid purchase order csv to continue",
   "Please upload a valid reset inventory csv to continue": "Please upload a valid reset inventory csv to continue",
   "PO External Order ID": "PO External Order ID",
@@ -113,6 +116,7 @@
   "Review": "Review",
   "Review PO details": "Review PO details",
   "Review purchase order": "Review purchase order",
+  "Reviewing uploaded file": "Reviewing uploaded file",
   "Reset": "Reset",
   "Reset inventory": "Reset inventory",
   "Reset password": "Reset password",
@@ -126,6 +130,7 @@
   "Search": "Search",
   "Search products": "Search products",
   "Search time zones": "Search time zones",
+  "Seems like uploaded file has missing products, checked with initial records.": "Seems like uploaded file has missing products, checked with initial {initialCount} records.",
   "Select": "Select",
   "Select mapping": "Select mapping",
   "Select SKU": "Select SKU",
diff --git a/src/services/UtilService.ts b/src/services/UtilService.ts
index 138feda3..5c65c4df 100644
--- a/src/services/UtilService.ts
+++ b/src/services/UtilService.ts
@@ -17,7 +17,16 @@ const getFacilityLocations = async (payload: any): Promise<any> => {
   })
 }
 
+const fetchGoodIdentificationTypes = async (payload: any): Promise<any> => {
+  return api({
+    url: "/performFind",
+    method: "POST",
+    data: payload
+  })
+}
+
 export const UtilService = {
+    fetchGoodIdentificationTypes,
     getFacilities,
     getFacilityLocations
 }
\ No newline at end of file
diff --git a/src/store/modules/order/actions.ts b/src/store/modules/order/actions.ts
index 76494a83..3b51fd2a 100644
--- a/src/store/modules/order/actions.ts
+++ b/src/store/modules/order/actions.ts
@@ -7,21 +7,22 @@ import * as types from './mutation-types'
 
 const actions: ActionTree<OrderState, RootState> = {
   async fetchOrderDetails ({commit, rootGetters}, items) {
-    const productIds = items.filter((item: any) =>  item.shopifyProductSKU).map((item: any) => {
-      return item.shopifyProductSKU
+    const productIds = items.filter((item: any) => item.identification).map((item: any) => {
+      return item.identification
     })
     const viewSize = productIds.length;
     const viewIndex = 0;
     const payload = {
       viewSize,
       viewIndex,
-      productIds
+      productIds,
+      identificationTypeId: items[0]?.identificationTypeId
     }
     await store.dispatch("product/fetchProducts", payload);
     const unidentifiedItems = [] as any;
 
-    items = items.filter((item: any) =>  item.shopifyProductSKU).map((item: any) => {
-      const product = rootGetters['product/getProduct'](item.shopifyProductSKU)
+    items = items.filter((item: any) => item.identification).map((item: any) => {
+      const product = rootGetters['product/getProduct'](item.identification)
 
       if (Object.keys(product).length > 0) {
         item.parentProductId = product?.parent?.id;
diff --git a/src/store/modules/product/actions.ts b/src/store/modules/product/actions.ts
index c9aafd09..0932b9b7 100644
--- a/src/store/modules/product/actions.ts
+++ b/src/store/modules/product/actions.ts
@@ -8,7 +8,7 @@ import logger from "@/logger";
 
 const actions: ActionTree<ProductState, RootState> = {
 
-  async fetchProducts ( { commit, state }, { productIds }) {
+  async fetchProducts ( { commit, state }, { productIds, identificationTypeId }) {
 
     // TODO Add try-catch block
 
@@ -23,9 +23,10 @@ const actions: ActionTree<ProductState, RootState> = {
 
     // If there are no product ids to search skip the API call
     if (productIdFilter.length == 0) return state.cached;
-
+    
+    const modifiedProductIdFilters = productIdFilter.map((productId: string) => identificationTypeId + '/' + productId);
     const resp = await fetchProducts({
-      filters: { 'internalName': { 'value': productIdFilter }},
+      filters: { 'goodIdentifications': { 'value': modifiedProductIdFilters }},
       viewSize: productIdFilter.length,
       viewIndex: 0
     })
diff --git a/src/store/modules/stock/StockState.ts b/src/store/modules/stock/StockState.ts
index c5924eef..fee226ff 100644
--- a/src/store/modules/stock/StockState.ts
+++ b/src/store/modules/stock/StockState.ts
@@ -3,6 +3,7 @@ export default interface StockState {
     parsed: any,
     original: any,
     unidentifiedItems: any,
+    initial: any,
   }, 
   fileName: string
 }
diff --git a/src/store/modules/stock/actions.ts b/src/store/modules/stock/actions.ts
index 3c6d6ca5..324ba61f 100644
--- a/src/store/modules/stock/actions.ts
+++ b/src/store/modules/stock/actions.ts
@@ -5,8 +5,12 @@ import StockState from './StockState'
 import * as types from './mutation-types'
 
 const actions: ActionTree<StockState, RootState> = {
-  async processUpdateStockItems ({ commit }, items) {
-    const productIds = items.map((item: any) => item.shopifyProductSKU)
+  async processUpdateStockItems ({ commit, rootGetters }, items) {
+    this.dispatch('util/updateFileProcessingStatus', true);
+
+    //Fetching only top 
+    const productIds = items.slice(0, process.env['VUE_APP_VIEW_SIZE']).map((item: any) => item.identification);
+
 
     // We are getting external facilityId from CSV, extract facilityId and pass for getting locations
     const externalFacilityIds = [...new Set(items.map((item: any) => item.externalFacilityId))]
@@ -19,20 +23,25 @@ const actions: ActionTree<StockState, RootState> = {
       return facilityMapping[externalFacilityId];
     }).filter((facilityId: any) => facilityId)
     store.dispatch('util/fetchFacilityLocations', facilityIds);
+    
 
     const viewSize = productIds.length;
     const viewIndex = 0;
     const payload = {
       viewSize,
       viewIndex,
-      productIds
+      productIds,
+      identificationTypeId: items[0]?.identificationTypeId //fetching identificationTypeId from first item, as all the items will have one identification type
     }
     const cachedProducts = await store.dispatch("product/fetchProducts", payload);
-    const unidentifiedItems = [] as any;
-    const parsed = items.map((item: any) => {
-      const product = cachedProducts[item.shopifyProductSKU];
+    const parsed = [] as any;
+    const initial = items.map((item: any) => {
+      const product = cachedProducts[item.identification];
+      const facilityLocation = rootGetters['util/getFacilityLocationsByFacilityId'](item.externalFacilityId)?.[0];
+      item.locationSeqId = facilityLocation?.locationSeqId;
+      parsed.push(item);
       
-      if(product){
+      if (product) {
         item.parentProductId = product?.parent?.id;
         item.pseudoId = product.pseudoId;
         item.parentProductName = product?.parent?.productName;
@@ -40,36 +49,19 @@ const actions: ActionTree<StockState, RootState> = {
         item.isSelected = true;
         return item;
       }
-      unidentifiedItems.push(item);
       return;
     }).filter((item: any) => item);
 
-    const original = JSON.parse(JSON.stringify(parsed));
+    const original = JSON.parse(JSON.stringify(items));
 
-    commit(types.STOCK_ITEMS_UPDATED, { parsed, original, unidentifiedItems });
+    commit(types.STOCK_ITEMS_UPDATED, { parsed, original, initial });
+    this.dispatch('util/updateFileProcessingStatus', false);
   },
   updateStockItems({ commit }, stockItems){
     commit(types.STOCK_ITEMS_UPDATED, stockItems);
   },
   clearStockItems({ commit }){
-    commit(types.STOCK_ITEMS_UPDATED, { parsed: [], original: [], unidentifiedItems: []});
-  },
-  updateUnidentifiedItem({ commit, state }, payload: any) {
-    const parsed = state.items.parsed as any;
-    const unidentifiedItems = payload.unidentifiedItems.map((item: any) => {
-      if(item.updatedSku) {
-        item.initialSKU = item.shopifyProductSKU;
-        item.shopifyProductSKU = item.updatedSku;
-        parsed.push(item);
-        state.items.original.push(item);
-      } else {
-        return item;
-      }
-    }).filter((item: any) => item);
-
-    const original = JSON.parse(JSON.stringify(state.items.original));
-
-    commit(types.STOCK_ITEMS_UPDATED, { parsed, original, unidentifiedItems});
+    commit(types.STOCK_ITEMS_UPDATED, { parsed: [], original: []});
   },
   async updateMissingFacilities({ state }, facilityMapping){
     const facilityLocations = await this.dispatch('util/fetchFacilityLocations', Object.values(facilityMapping));
diff --git a/src/store/modules/stock/index.ts b/src/store/modules/stock/index.ts
index 41751b03..60be7fe3 100644
--- a/src/store/modules/stock/index.ts
+++ b/src/store/modules/stock/index.ts
@@ -12,6 +12,7 @@ const orderModule: Module<StockState, RootState> = {
       parsed: [],
       original: [],
       unidentifiedItems: [],
+      initial: []
     },
     fileName: ""
   },
diff --git a/src/store/modules/stock/mutations.ts b/src/store/modules/stock/mutations.ts
index 637ed8f3..7cf5fd83 100644
--- a/src/store/modules/stock/mutations.ts
+++ b/src/store/modules/stock/mutations.ts
@@ -7,6 +7,7 @@ const mutations: MutationTree <StockState> = {
     state.items.parsed = payload.parsed;
     state.items.original = payload.original;
     state.items.unidentifiedItems = payload.unidentifiedItems;
+    state.items.initial = payload.initial;
   }
 }
 export default mutations;
\ No newline at end of file
diff --git a/src/store/modules/util/UtilState.ts b/src/store/modules/util/UtilState.ts
index ea7f9347..859d779c 100644
--- a/src/store/modules/util/UtilState.ts
+++ b/src/store/modules/util/UtilState.ts
@@ -1,4 +1,6 @@
 export default interface UserState {
     facilities: [],
     facilityLocationsByFacilityId: any;
+    goodIdentificationTypes: [],
+    isProcessingFile: false,
 }
\ No newline at end of file
diff --git a/src/store/modules/util/actions.ts b/src/store/modules/util/actions.ts
index c0ef4f29..259cad2e 100644
--- a/src/store/modules/util/actions.ts
+++ b/src/store/modules/util/actions.ts
@@ -51,8 +51,8 @@ const actions: ActionTree<UtilState, RootState> = {
         facilityId: unavailablefacilityIds,
         "facilityId_op": 'in'
       },
-      // Assuming we will not have more than 15 facility locations.
-      "viewSize": unavailablefacilityIds.length * 15,
+      // setting highest viewSize that performFind can fetch.
+      "viewSize": 250,
       "fieldList": ["locationSeqId", "areaId", "aisleId", "sectionId", "levelId", "positionId", "facilityId"],
       "entityName": "FacilityLocation",
       "distinct": "Y",
@@ -80,6 +80,34 @@ const actions: ActionTree<UtilState, RootState> = {
     }
     return state.facilityLocationsByFacilityId;
   },
+
+  async fetchGoodIdentificationTypes({ state, commit }) {
+    if (state.goodIdentificationTypes.length) return state.goodIdentificationTypes;
+    
+    const payload = {
+      "inputFields": {
+        "parentTypeId": "HC_GOOD_ID_TYPE",
+      },
+      "fieldList": ["goodIdentificationTypeId", "description"],
+      "viewSize": 50,
+      "entityName": "GoodIdentificationType",
+      "noConditionFind": "Y"
+    }
+    try {
+      const resp = await UtilService.fetchGoodIdentificationTypes(payload);
+      if (!hasError(resp) && resp.data.count > 0) {
+        commit(types.UTIL_GOOD_IDENTIFICATION_TYPES_UPDATED, resp.data.docs);
+      } else {
+        throw resp.data;
+      }
+    } catch (err) {
+      logger.error(err)
+    }
+    return state.facilities;
+  },
+  async updateFileProcessingStatus({ commit }, status){
+    commit(types.UTIL_FILE_PROCESSING_STATUS_UPDATED, { status });
+  },
 }
 
 
diff --git a/src/store/modules/util/getters.ts b/src/store/modules/util/getters.ts
index 1e3d3afa..47e6948d 100644
--- a/src/store/modules/util/getters.ts
+++ b/src/store/modules/util/getters.ts
@@ -9,5 +9,11 @@ const getters: GetterTree <UtilState, RootState> = {
     getFacilityLocationsByFacilityId: (state) => (facilityId: string) => {
         return state.facilityLocationsByFacilityId[facilityId]
     },
+    getGoodIdentificationTypes(state) {
+        return state.goodIdentificationTypes;
+    },
+    getFileProcessingStatus(state) {
+        return state.isProcessingFile;
+    }
 }
 export default getters;
\ No newline at end of file
diff --git a/src/store/modules/util/index.ts b/src/store/modules/util/index.ts
index 1e30065f..3b3c25b5 100644
--- a/src/store/modules/util/index.ts
+++ b/src/store/modules/util/index.ts
@@ -10,6 +10,8 @@ const userModule: Module<UserState, RootState> = {
     state: {
       facilities: [],
       facilityLocationsByFacilityId: {},
+      goodIdentificationTypes: [],
+      isProcessingFile: false
     },
     getters,
     actions,
diff --git a/src/store/modules/util/mutation-types.ts b/src/store/modules/util/mutation-types.ts
index c828d11f..31c4f81a 100644
--- a/src/store/modules/util/mutation-types.ts
+++ b/src/store/modules/util/mutation-types.ts
@@ -1,3 +1,6 @@
 export const SN_UTIL = 'util'
 export const UTIL_FACILITIES_UPDATED = SN_UTIL + '/FACILITIES_UPDATED'
 export const UTIL_FACILITY_LOCATIONS_BY_FACILITY_ID = SN_UTIL + '/FACILITY_LOCATIONS_BY_FACILITY_ID'
+export const UTIL_GOOD_IDENTIFICATION_TYPES_UPDATED = SN_UTIL + '/GOOD_IDENTIFICATION_TYPES_UPDATED'
+export const UTIL_FILE_PROCESSING_STATUS_UPDATED = SN_UTIL + '/FILE_PROCESSING_STATUS_UPDATED'
+
diff --git a/src/store/modules/util/mutations.ts b/src/store/modules/util/mutations.ts
index ffb69d95..9080fad7 100644
--- a/src/store/modules/util/mutations.ts
+++ b/src/store/modules/util/mutations.ts
@@ -11,5 +11,11 @@ const mutations: MutationTree <UtilState> = {
             state.facilityLocationsByFacilityId[facilityId] = facilityLocations[facilityId];
         })
     },
+    [types.UTIL_GOOD_IDENTIFICATION_TYPES_UPDATED](state, payload) {
+        state.goodIdentificationTypes = payload
+    },
+    [types.UTIL_FILE_PROCESSING_STATUS_UPDATED] (state, payload) {
+        state.isProcessingFile = payload.status;
+      }
 }
 export default mutations;
\ No newline at end of file
diff --git a/src/theme/variables.css b/src/theme/variables.css
index d55e9db0..bc8f0ef9 100644
--- a/src/theme/variables.css
+++ b/src/theme/variables.css
@@ -256,6 +256,23 @@ http://ionicframework.com/docs/theming/ */
   margin: var(--spacer-sm);
 }
 
+.empty-state {
+  max-width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 10px;
+}
+
+.empty-state>img {
+  object-fit: contain;
+}
+
+.empty-state>p {
+  text-align: center;
+}
+
 @media (min-width: 991px) {
   .desktop-only {
     display: unset;
diff --git a/src/views/Inventory.vue b/src/views/Inventory.vue
index 34f930e9..43cef3f5 100644
--- a/src/views/Inventory.vue
+++ b/src/views/Inventory.vue
@@ -32,9 +32,20 @@
         <ion-list>
           <ion-list-header>{{ $t("Select the column index for the following information in the uploaded CSV.") }}</ion-list-header>
           <ion-item :key="field" v-for="(fieldValues, field) in fields">
-            <ion-select :label="$t(fieldValues.label)" interface="popover" :disabled="!content.length" :placeholder="$t('Select')" v-model="fieldMapping[field]">
-              <ion-select-option :key="index" v-for="(prop, index) in fileColumns">{{ prop }}</ion-select-option>
-            </ion-select>
+            <template v-if="field === 'productIdentification'">
+              <ion-select interface="popover" :placeholder = "$t('Select')" slot="start" v-model="identificationTypeId">
+                <ion-select-option :key="goodIdentificationType.goodIdentificationTypeId" :value="goodIdentificationType.goodIdentificationTypeId" v-for="goodIdentificationType in goodIdentificationTypes">{{ goodIdentificationType.description }}</ion-select-option>
+              </ion-select>
+              <ion-select interface="popover" v-if="content.length" :placeholder = "$t('Select')" slot="end" v-model="fieldMapping['productIdentification']">
+                <ion-select-option :key="index" v-for="(prop, index) in fileColumns">{{ prop }}</ion-select-option>
+              </ion-select>
+            </template>
+            <template v-else>
+              <ion-label>{{ $t(fieldValues.label) }}</ion-label>
+              <ion-select :label="$t(fieldValues.label)" interface="popover" v-if="content.length" :placeholder = "$t('Select')" v-model="fieldMapping[field]">
+                <ion-select-option :key="index" v-for="(prop, index) in fileColumns">{{ prop }}</ion-select-option>
+              </ion-select>
+            </template>
           </ion-item>
         </ion-list>
 
@@ -46,6 +57,7 @@
     </ion-content>
   </ion-page>
 </template>
+
 <script>
 import { IonChip, IonPage, IonHeader, IonToolbar, IonTitle, IonContent, IonItem, IonLabel, IonList, IonListHeader, IonMenuButton, IonButton, IonSelect, IonSelectOption, IonIcon, modalController } from "@ionic/vue";
 import { defineComponent } from "vue";
@@ -82,12 +94,14 @@ export default defineComponent({
       content: [],
       fieldMapping: {},
       fileColumns: [],
-      fields: process.env["VUE_APP_MAPPING_RSTINV"] ? JSON.parse(process.env["VUE_APP_MAPPING_RSTINV"]) : {}
+      fields: process.env["VUE_APP_MAPPING_RSTINV"] ? JSON.parse(process.env["VUE_APP_MAPPING_RSTINV"]) : {},
+      identificationTypeId: "SHOPIFY_PROD_SKU",
     }
   },
   computed: {
     ...mapGetters({
-      fieldMappings: 'user/getFieldMappings'
+      fieldMappings: 'user/getFieldMappings',
+      goodIdentificationTypes: 'util/getGoodIdentificationTypes'
     })
   },
   mixins:[ parseFileMixin ],
@@ -99,6 +113,8 @@ export default defineComponent({
       return fieldMapping;
     }, {})
     this.$refs.file.value = null;
+
+    this.store.dispatch('util/fetchGoodIdentificationTypes');
   },
   methods: {
     mapFields(mapping) {
@@ -146,7 +162,8 @@ export default defineComponent({
 
       const stockItems = this.content.map(item => {
         return {
-          shopifyProductSKU: item[this.fieldMapping.productSku],
+          identification: item[this.fieldMapping.productIdentification],
+          identificationTypeId: this.identificationTypeId,
           quantity: item[this.fieldMapping.quantity],
           facilityId: '',
           externalFacilityId: item[this.fieldMapping.facility],
diff --git a/src/views/InventoryReview.vue b/src/views/InventoryReview.vue
index 0019db77..51150423 100644
--- a/src/views/InventoryReview.vue
+++ b/src/views/InventoryReview.vue
@@ -3,10 +3,10 @@
     <ion-header :translucent="true">
       <ion-toolbar>
         <ion-back-button slot="start" default-href="/inventory" />
+        <ion-title v-if="!stockItems.initial || stockItems.initial.length === 0">{{stockItems.parsed.length}} {{ $t('items') }}</ion-title>
+        <ion-title v-else>{{ stockItems.initial.length }} {{ $t('of') }} {{ stockItems.parsed.length }} {{ $t('items') }}</ion-title>
+     
         <ion-buttons slot="end">
-          <ion-button @click="selectAllItems">
-            <ion-icon slot="icon-only" :icon="checkboxOutline" />
-          </ion-button>
           <ion-button @click="revertAll">
             <ion-icon slot="icon-only" :icon="arrowUndoOutline" />
           </ion-button>
@@ -16,85 +16,45 @@
 
     <ion-content >
       <div class="header">
-        <div class="search">
-          <ion-searchbar  :placeholder="$t('Search products')" v-model="queryString" v-on:keyup.enter="queryString = $event.target.value; searchProduct(queryString)" />
-        </div>
-
+        <ion-card color="light">
+          <ion-card-content>
+            <ion-icon slot="start" color="danger" :icon="warningOutline"></ion-icon>
+            {{ $t("Please ensure that the uploaded file contains accurate product information. If a product does not exist, the corresponding records will not be processed.") }}
+          </ion-card-content>
+        </ion-card>
         <div class="filters">
-          <ion-item @click="openBulkInventoryAdjustmentModal()" button> 
-            <ion-icon slot="start" :icon="calculatorOutline" />
-            <ion-label>{{ $t("Bulk adjustment") }}</ion-label>
-            <ion-note slot="end">{{ getSelectedItems() }} {{ $t("items selected") }}</ion-note>
-            <ion-icon slot="end" :icon="chevronForwardOutline" />
-          </ion-item>
-
           <ion-item @click="openMissingFacilitiesModal()" button>
             <ion-icon slot="start" :icon="businessOutline" />
             <ion-label>{{ $t("Missing facilities") }}</ion-label>
             <ion-note slot="end">{{ getItemsWithMissingFacility().length }} {{ $t("items") }}</ion-note>
             <ion-icon slot="end" mode="ios" :icon="chevronForwardOutline" />
           </ion-item>
-
-          <ion-item @click="openMissingSkuModal()" button>
-            <ion-icon slot="start" :icon="shirtOutline" />
-            <ion-label>{{ $t("Missing products") }}</ion-label>
-            <ion-note slot="end">{{ stockItems.unidentifiedItems.length }} {{ $t("items") }}</ion-note>
-            <ion-icon slot="end" :icon="chevronForwardOutline" />
-          </ion-item>
         </div>
       </div>  
 
-      <div v-if="searchedProduct?.pseudoId" class="list-item">
-        <ion-item lines="none">
-          <ion-thumbnail>
-            <ShopifyImg :src="searchedProduct.imageUrl" size="small" />
-          </ion-thumbnail>
-          <ion-label class="ion-text-wrap">
-            <h3>{{ searchedProduct.pseudoId }}</h3>
-            <p v-if="searchedProduct.initialSKU">{{ searchedProduct.initialSKU }}</p>
-          </ion-label>
-        </ion-item>
-
-        <ion-chip outline>
-          <ion-label>{{ searchedProduct.quantity }} {{ $t("Items") }}</ion-label>
-        </ion-chip>
-
-        <ion-chip outline class="tablet">
-          <ion-label>{{ searchedProduct.externalFacilityId ? searchedProduct.externalFacilityId : searchedProduct.facilityId }}</ion-label>
-        </ion-chip>
-
-        <ion-chip outline class="tablet location">
-          <ion-select interface="popover" :value="searchedProduct.locationSeqId" @ionChange="setFacilityLocation($event, searchedProduct)">
-            <ion-icon slot="start" :icon="locationOutline" />
-            <ion-select-option v-for="facilityLocation in getFacilityLocationsByFacilityId(searchedProduct.externalFacilityId ? searchedProduct.externalFacilityId : searchedProduct.facilityId)" :key="facilityLocation.locationSeqId" :value="facilityLocation.locationSeqId" >{{ facilityLocation.locationSeqId }}</ion-select-option>
-          </ion-select>
-        </ion-chip>
-
-        <!-- Used :key as the changed value was not reflected -->
-        <ion-checkbox aria-label="select-searched" :key="searchedProduct.isSelected" :checked="searchedProduct.isSelected" @ionChange="selectProduct(searchedProduct, $event)"/>
-        
-        <ion-button fill="clear" color="medium" @click="openProductPopover($event, searchedProduct.pseudoId, false, searchedProduct, 'stock')">
-          <ion-icon slot="icon-only" :icon="ellipsisVerticalOutline" />
-        </ion-button>
+      <div class="empty-state" v-if="isProcessingFile">
+        <ion-spinner name="crescent" />
+        <p>{{ $t("Reviewing uploaded file") }}</p>
+      </div>
+      <!-- Empty state -->
+      <div class="empty-state" v-else-if="!stockItems.initial || stockItems.initial.length === 0">
+        <p>{{ $t("Seems like uploaded file has missing products, checked with initial records.", { initialCount: viewSize }) }}</p>
       </div>
 
-      <div v-else v-for="id in getParentProductIds(stockItems.parsed)" :key="id">
+      <template v-else>
+      <div v-for="id in getParentProductIds(stockItems.initial)" :key="id">
         <div class="list-item list-header">
-          <ion-label class="ion-padding-start">{{ getParentInformation(id, stockItems.parsed).parentProductName }}</ion-label>
+          <ion-item color="light" lines="none">
+            <ion-label>{{ getParentInformation(id, stockItems.initial).parentProductName }}</ion-label>
+          </ion-item>
 
           <div class="tablet" />
 
           <div class="tablet" />
 
           <div />
-          
-          <ion-checkbox aria-label="select-virtual" :checked="isParentProductChecked(id)" @click="isParentProductUpdated = true" @ionChange="selectParentProduct(id, $event)" />
-
-          <ion-button fill="clear" color="medium" @click="openProductPopover($event, id, true, getParentInformation(id, stockItems.parsed), 'stock')">
-            <ion-icon slot="icon-only" :icon="ellipsisVerticalOutline" />
-          </ion-button>
         </div>
-        <div v-for="(item, index) in getItemsByParentProduct(id, stockItems.parsed)" :key="index">
+        <div v-for="(item, index) in getItemsByParentProduct(id, stockItems.initial)" :key="index">
           <div class="list-item">
             <ion-item lines="none">
               <ion-thumbnail slot="start">
@@ -114,21 +74,16 @@
               <ion-label>{{ getFacilityName(item.facilityId, item.externalFacilityId) }}</ion-label>
             </ion-chip>
             <ion-chip outline class="tablet location">
-              <ion-select interface="popover" :value="item.locationSeqId" @ionChange="setFacilityLocation($event, item)">
-                <ion-icon slot="start" :icon="locationOutline" />
-                <ion-select-option v-for="facilityLocation in getFacilityLocationsByFacilityId(item.facilityId ? item.facilityId : item.externalFacilityId)" :key="facilityLocation.locationSeqId" :value="facilityLocation.locationSeqId" >{{ facilityLocation.locationPath }}</ion-select-option>
-              </ion-select>
+              <ion-icon :icon="locationOutline" />
+              <ion-label>{{ item.locationSeqId }}</ion-label>
             </ion-chip>
-
-            <!-- Used :key as the changed value was not reflected -->
-            <ion-checkbox aria-label="select-variant" :key="item.isSelected" :checked="item.isSelected" @ionChange="selectProduct(item, $event)"/>
-            
-            <ion-button fill="clear" color="medium" @click="openProductPopover($event, item.pseudoId, false, item, 'stock')">
-              <ion-icon slot="icon-only" :icon="ellipsisVerticalOutline" />
-            </ion-button>
           </div>
         </div>
       </div>
+      <ion-item>
+        <ion-label> {{ $t('more items', { remainingItemCount: stockItems.parsed.length - stockItems.initial.length }) }}</ion-label>
+      </ion-item>
+      </template>
 
       <ion-fab vertical="bottom" horizontal="end" slot="fixed">
         <ion-fab-button @click="save">
@@ -144,42 +99,42 @@ import { ShopifyImg } from "@hotwax/dxp-components";
 import ProductPopover from '@/components/ProductPopover.vue'
 import BulkInventoryAdjustmentModal from '@/components/BulkInventoryAdjustmentModal.vue'
 import MissingFacilitiesModal from '@/components/MissingFacilitiesModal.vue'
-import MissingSkuModal from "@/components/MissingSkuModal.vue"
 import { defineComponent } from 'vue';
 import { mapGetters, useStore } from "vuex";
 import { useRouter } from 'vue-router';
 import { showToast } from '@/utils';
 import { translate } from "@/i18n";
-import { IonPage, IonHeader, IonToolbar, IonBackButton, IonContent, IonSearchbar, IonItem, IonThumbnail, IonLabel, IonChip, IonIcon, IonButton, IonCheckbox, IonSelect, IonSelectOption, IonButtons, popoverController, IonFab, IonFabButton, modalController, alertController, IonNote } from '@ionic/vue'
-import { businessOutline, calculatorOutline, chevronForwardOutline, ellipsisVerticalOutline, locationOutline, shirtOutline, checkboxOutline, cloudUploadOutline, arrowUndoOutline } from 'ionicons/icons'
+import { IonCard, IonCardContent, IonPage, IonHeader, IonToolbar, IonBackButton, IonContent, IonItem, IonThumbnail, IonLabel, IonChip, IonIcon, IonButton, IonButtons, popoverController, IonFab, IonFabButton, modalController, alertController, IonNote, IonSpinner, IonTitle } from '@ionic/vue'
+import { businessOutline, calculatorOutline, chevronForwardOutline, ellipsisVerticalOutline, locationOutline, shirtOutline, checkboxOutline, cloudUploadOutline, arrowUndoOutline, warningOutline } from 'ionicons/icons'
 
 export default defineComponent({
   name: 'InventoryDetail',
   components: {
     ShopifyImg,
+    IonCard,
+    IonCardContent,
     IonPage,
     IonHeader,
     IonToolbar,
     IonBackButton,
     IonContent,
-    IonSearchbar,
     IonItem,
     IonThumbnail,
     IonLabel,
     IonChip,
     IonIcon,
     IonButton,
-    IonCheckbox,
-    IonSelect,
-    IonSelectOption,
     IonButtons,
     IonFab,
     IonFabButton,
-    IonNote
+    IonNote,
+    IonSpinner,
+    IonTitle
   },
   computed: {
     ...mapGetters({
       stockItems: 'stock/getStockItems',
+      isProcessingFile: 'util/getFileProcessingStatus',
       getProduct: 'product/getProduct',
       instanceUrl: 'user/getInstanceUrl',
       facilities: 'util/getFacilities',
@@ -190,11 +145,10 @@ export default defineComponent({
   data() {
     return {
       facilityId: (this as any)?.stockItems?.parsed[0]?.facilityId,
-      queryString: "",
-      searchedProduct: {} as any,
       isParentProductUpdated: false,
       isCsvUploadedSuccessfully: false,
-      facilityLocations: {}
+      facilityLocations: {},
+      viewSize: process.env['VUE_APP_VIEW_SIZE']
     }
   },
   ionViewDidEnter(){
@@ -230,16 +184,6 @@ export default defineComponent({
   },
   
   methods: {
-    async openMissingSkuModal() {
-      const missingSkuModal = await modalController.create({
-        component: MissingSkuModal,
-        componentProps: { 'unidentifiedItems': this.stockItems.unidentifiedItems, type: 'stock' }
-      });
-      missingSkuModal.onDidDismiss().then(() => {
-        this.searchProduct(this.queryString);
-      });
-      return missingSkuModal.present();
-    },
     getFacilityName(facilityId: any, externalFacilityId: any) {
       if (facilityId) {
         const facility = this.facilities.find((facility: any) => facilityId === facility.facilityId );
@@ -266,9 +210,6 @@ export default defineComponent({
         component: MissingFacilitiesModal,
         componentProps: { itemsWithMissingFacility, type: 'stock' }
       });
-      missingFacilitiesModal.onDidDismiss().then(() => {
-        this.searchProduct(this.queryString);
-      });
       return missingFacilitiesModal.present();
     },
     getSelectedItems(){
@@ -282,21 +223,13 @@ export default defineComponent({
       });
       this.store.dispatch('stock/updateStockItems', this.stockItems);
     },
-    searchProduct(sku: any) {
-      const product = this.getProduct(sku);
-      this.searchedProduct = this.stockItems.parsed.find((item: any) => {
-        return item.pseudoId === product.pseudoId;
-      })
-    },
     async save(){
-      const uploadData = this.stockItems.parsed.filter((item: any) => {
-        return item.isSelected;
-      }).map((item: any) => {
+      const uploadData = this.stockItems.parsed.map((item: any) => {
         return {
           "facilityId": item.facilityId,
           "externalFacilityId": item.externalFacilityId,
-          "idValue": item.shopifyProductSKU,
-          "idType": "SKU",
+          "idValue": item.identification,
+          "idType": item.identificationTypeId,
           "locationSeqId": item.locationSeqId,
           "availableQty": item.quantity
         };
@@ -349,24 +282,17 @@ export default defineComponent({
           showBackdrop: true,
           componentProps: { 'id': id, 'isVirtual': isVirtual, 'item': item, 'type': type }
         });
-        productPopover.onDidDismiss().then(() => {
-          this.searchProduct(this.queryString);
-        });
       return productPopover.present();
     },
     isParentProductChecked(parentProductId: string) {
       const items = this.getItemsByParentProduct(parentProductId, this.stockItems.parsed);
       return items.every((item: any) => item.isSelected)
     },
-    selectProduct(item: any, event: any) {
-      item.isSelected = event.detail.checked;
-      this.store.dispatch('stock/updateStockItems', this.stockItems)
-    },
     revertAll() {
       this.stockItems.parsed = JSON.parse(JSON.stringify(this.stockItems.original));
+      this.stockItems.initial = this.stockItems.parsed.slice(0, process.env['VUE_APP_VIEW_SIZE']);
       
       this.store.dispatch('stock/updateStockItems', this.stockItems);
-      if(this.queryString) this.searchProduct(this.queryString);
     },
     getParentProductIds (items: any) {
       return Array.from(new Set(items.map((ele: any) => ele.parentProductId)));
@@ -377,33 +303,6 @@ export default defineComponent({
     getParentInformation(id: any, items: any) {
       return items.find((item: any) => item.parentProductId == id)
     },
-    selectAllItems() {
-      this.stockItems.parsed.forEach((item: any) => {
-        item.isSelected = true;
-      })
-      this.store.dispatch('stock/updateStockItems', this.stockItems)
-    },
-    selectParentProduct(parentProductId: any, event: any) {
-      // Todo: Need to find a better approach.
-      if(this.isParentProductUpdated){
-        this.stockItems.parsed.forEach((item: any) => {
-          if (item.parentProductId === parentProductId) {
-            item.isSelected = event.detail.checked;
-          }
-        })
-        this.isParentProductUpdated = false;
-      }
-      this.store.dispatch('stock/updateStockItems', this.stockItems);
-    },
-    async openBulkInventoryAdjustmentModal() {
-      const bulkInventoryAdjustmentModal = await modalController.create({
-        component: BulkInventoryAdjustmentModal,
-      });
-      bulkInventoryAdjustmentModal.onDidDismiss().then(() => {
-        this.searchProduct(this.queryString);
-      });
-      return bulkInventoryAdjustmentModal.present();
-    },
   },
   setup() {
     const router = useRouter();
@@ -419,6 +318,7 @@ export default defineComponent({
       arrowUndoOutline,
       shirtOutline,
       cloudUploadOutline,
+      warningOutline,
       router,
       store,
     }
@@ -452,7 +352,6 @@ export default defineComponent({
 
 ion-chip > ion-select {
   padding: 0px;
-  min-height: 0px;
 }
 
 .location {
diff --git a/src/views/PurchaseOrder.vue b/src/views/PurchaseOrder.vue
index 9f34dd80..b3f83b59 100644
--- a/src/views/PurchaseOrder.vue
+++ b/src/views/PurchaseOrder.vue
@@ -129,7 +129,8 @@ export default defineComponent({
         const purchaseOrderItems = this.content.map(item => {
           return {
             orderId: item[this.fieldMapping.orderId],
-            shopifyProductSKU: item[this.fieldMapping.productSku],
+            identification: item[this.fieldMapping.productSku],
+            identificationTypeId: "SHOPIFY_PROD_SKU",
             arrivalDate: item[this.fieldMapping.orderDate],
             quantityOrdered: item[this.fieldMapping.quantity],
             facilityId: '',
diff --git a/src/views/PurchaseOrderReview.vue b/src/views/PurchaseOrderReview.vue
index 37f3b24a..fee6e4aa 100644
--- a/src/views/PurchaseOrderReview.vue
+++ b/src/views/PurchaseOrderReview.vue
@@ -46,7 +46,7 @@
           <ion-item @click="openMissingSkuModal()" button>
             <ion-icon slot="start" :icon="shirtOutline" />
             <ion-label>{{ $t("Missing products") }}</ion-label>
-            <ion-note slot="end">{{ purchaseOrders.unidentifiedItems.length }} {{ $t("items") }}</ion-note>
+            <ion-note slot="end">{{ purchaseOrders.unidentifiedItems?.length }} {{ $t("items") }}</ion-note>
             <ion-icon slot="end" :icon="chevronForwardOutline" />
           </ion-item>
         </div>
@@ -254,8 +254,8 @@ export default defineComponent({
           "arrivalDate": DateTime.fromFormat(item.arrivalDate, this.dateTimeFormat).toFormat('MM/dd/yyyy'),
           "quantity": item.quantityOrdered,
           "isNewProduct": item.isNewProduct,
-          "idValue": item.shopifyProductSKU,
-          "idType": "SKU"
+          "idValue": item.identification,
+          "idType": item.identificationTypeId
         };
       })
       const fileName = this.fileName.replace(".csv", ".json");