diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 6471767c..b8c851cd 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -1,9 +1,11 @@
 {
+  "Add address": "Add address",
   "Are you sure you want to save the changes?": "Are you sure you want to save the changes?",
   "Are you sure you want to cancel the order items?": "Are you sure you want to cancel the order items?",
   "Cancel": "Cancel",
   "Cancel items": "Cancel items",
   "Change Store": "Change Store",
+  "Changes saved": "Changes saved",
   "City": "City",
   "Confirm": "Confirm",
   "Click the backdrop to dismiss.": "Click the backdrop to dismiss.",
@@ -15,8 +17,10 @@
   "Fetching order details.": "Fetching order details.",
   "Fetching stores.": "Fetching stores.",
   "First name": "First name",
+  "Failed to cancel the order": "Failed to cancel the order",
   "Failed to update the pickup store": "Failed to update the pickup store",
   "Failed to update the shipping addess": "Failed to update the shipping addess",
+  "Fetching address": "Fetching address",
   "Last name": "Last name",
   "Login": "Login",
   "Logout": "Logout",
diff --git a/src/router/index.ts b/src/router/index.ts
index e6b3c540..749b4ca5 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -4,13 +4,16 @@ import Order from "@/views/Order.vue"
 
 const routes: Array<RouteRecordRaw> = [
   {
-    path: '/',
-    redirect: "/order",
+    path: "/order/:token",
+    name: "Order",
+    component: Order,
+    props: true
   },
   {
-    path: "/order",
+    path: '/:token',  // Added this route as when using redirect we can't define props as true and thus the redirect fails
     name: "Order",
-    component: Order
+    component: Order,
+    props: true
   }
 ]
 
diff --git a/src/services/OrderService.ts b/src/services/OrderService.ts
index bbcd3f0d..5a34501d 100644
--- a/src/services/OrderService.ts
+++ b/src/services/OrderService.ts
@@ -1,31 +1,35 @@
 import { api } from '@/adapter';
+import store from '@/store';
 
-const getOrder = async (): Promise <any>  => {
+const getOrder = async (payload: any): Promise <any>  => {
+  let baseURL = store.getters['user/getInstanceUrl'];
+  baseURL = baseURL && baseURL.startsWith('http') ? baseURL : `https://${baseURL}.hotwax.io/api/`;
   return api({
-    url: "orders",
-    method: "get",
+    url: "getRerouteOrder",
+    method: "post",
+    data: payload
   });
 }
 
 const updateShippingAddress = async (payload: any): Promise <any>  => {
   return api({
-    url: "service/updateShippingInformationOfShipGroup", 
+    url: "updateShippingAddressOfRerouteOrder",
     method: "post",
-    data: payload,
+    data: payload
   });
 }
 
 const updatePickupFacility = async (payload: any): Promise <any>  => {
   return api({
-    url: "service/updateOrderItemShipGroup", 
+    url: "updatePickupFacility",
     method: "post",
-    data: payload,
+    data: payload
   });
 }
 
 const cancelOrderItem = async (payload: any): Promise <any>  => {
   return api({
-    url: 'cancelOrderItem',
+    url: "cancelRerouteOrderItem",
     method: "post",
     data: payload
   });
@@ -33,7 +37,7 @@ const cancelOrderItem = async (payload: any): Promise <any>  => {
 
 const getProductStoreSetting = async (payload: any): Promise<any> => {
   return api({
-    url: 'getProductStoreSetting',
+    url: "getProductStoreSettingForRerouteOrder",
     method: "post",
     data: payload
   });
diff --git a/src/services/UtilityService.ts b/src/services/UtilityService.ts
index 930cf3b9..30dc14f5 100644
--- a/src/services/UtilityService.ts
+++ b/src/services/UtilityService.ts
@@ -2,7 +2,7 @@ import { api } from '@/adapter';
 
 const getAssociatedStates = async (payload: any): Promise <any>  => {
   return api({
-    url: "getStates", 
+    url: "getStatesForRerouteOrder",
     method: "post",
     data: payload,
   });
diff --git a/src/store/modules/user/actions.ts b/src/store/modules/user/actions.ts
index 0c59850c..3021eb86 100644
--- a/src/store/modules/user/actions.ts
+++ b/src/store/modules/user/actions.ts
@@ -114,14 +114,16 @@ const actions: ActionTree<UserState, RootState> = {
     updateInstanceUrl(payload)
   },
 
-  async getConfiguration({ commit }, productStoreId) {
+  async getConfiguration({ commit }, { productStoreId, token }) {
     try {
       const resp = await OrderService.getProductStoreSetting({
+        token,
         inputFields: {
           productStoreId,
           "settingTypeEnumId": ["CUST_DLVRMTHD_UPDATE", "CUST_DLVRADR_UPDATE", "CUST_PCKUP_UPDATE", "CUST_ALLOW_CNCL", "RF_SHIPPING_METHOD"],
           "settingTypeEnumId_op": "in"
-        }
+        },
+        viewSize: 100
       })
       if (!hasError(resp)) {
         const permissions = resp.data.docs.filter((permission: any) => permission.settingValue == 'true').map((permission: any) => permission.settingTypeEnumId)
diff --git a/src/views/AddressModal.vue b/src/views/AddressModal.vue
index 8eda8030..2135cfd0 100644
--- a/src/views/AddressModal.vue
+++ b/src/views/AddressModal.vue
@@ -52,7 +52,8 @@ import {
   IonSelectOption,
   IonTitle, 
   IonToolbar, 
-  modalController
+  modalController,
+  loadingController
 } from '@ionic/vue';
 import { defineComponent } from 'vue';
 import { closeOutline } from 'ionicons/icons';
@@ -90,13 +91,16 @@ export default defineComponent({
         countryGeoId: ""
       } as any,
       contactMechId: '',
-      states: [] as any
+      states: [] as any,
+      loader: null as any
     };
   },
-  props: ["shipGroup"],
+  props: ["shipGroup", "token"],
   async mounted() {
+    this.presentLoader()
     await this.getAssociatedStates()
     if (this.shipGroup.shipmentMethodTypeId != 'STOREPICKUP') this.prepareAddress();
+    this.dismissLoader()
   },
   methods: {
     async updateAddress() {
@@ -106,7 +110,9 @@ export default defineComponent({
       })
       if (hasEmptyValues) return showToast(translate("Please fill all the fields"))
       const state = this.states.find((state: any) => state.geoId === this.address.stateProvinceGeoId);
-      this.address.stateCode = state.geoCode;
+      // In some cases, we get a stateProvinceGeoId that does not exist in data, thus state is not displayed on the UI but originally the field has information thus toast of empty field is not displayed
+      // thus added a check that if the geoCode is not found in the states fetched from the server, do not stop the address update process and pass the same state that was previously in the address.
+      this.address.stateCode = state?.geoCode || this.address.stateProvinceGeoId;
       this.close(this.address);
     },
     prepareAddress() {
@@ -129,6 +135,7 @@ export default defineComponent({
     async getAssociatedStates() {
       try {
         const payload = {
+          "token": this.token,
           "countryGeoId": this.shipGroup.shipTo.postalAddress.countryGeoId,
           "viewSize": process.env.VUE_APP_VIEW_SIZE
         }
@@ -145,6 +152,19 @@ export default defineComponent({
     close(address?: any) {
       modalController.dismiss({ dismissed: true }, address);
     },
+    async presentLoader() {
+      this.loader = await loadingController
+        .create({
+          message: this.$t("Fetching address")
+        });
+      await this.loader.present();
+    },
+    dismissLoader() {
+      if (this.loader) {
+        this.loader.dismiss();
+        this.loader = null;
+      }
+    },
   },
   setup() {
     const router = useRouter();
diff --git a/src/views/Order.vue b/src/views/Order.vue
index bcbd4fb0..1440c0ac 100644
--- a/src/views/Order.vue
+++ b/src/views/Order.vue
@@ -45,7 +45,7 @@
               <ion-list>
                 <ion-label>{{ shipGroup.selectedFacility.facilityName }} </ion-label>
                 <ion-label color="dark">{{ shipGroup.selectedFacility.address1 }} </ion-label>
-                <ion-label color="dark">{{ shipGroup.selectedFacility.city }} {{ shipGroup.selectedFacility.stateCode }} {{ shipGroup.selectedFacility.postalCode }}</ion-label>
+                <ion-label color="dark">{{ shipGroup.selectedFacility.city }} {{ shipGroup.selectedFacility.stateCode }} {{ shipGroup.shipTo.postalAddress.country }} {{ shipGroup.selectedFacility.postalCode }}</ion-label>
               </ion-list>
               <ion-button :disabled="!hasPermission(Actions.APP_SHPGRP_PCKUP_UPDATE) && shipGroup.shipmentMethodTypeId === 'STOREPICKUP'" slot="end" @click="updatePickupLocation(shipGroup)" color="medium" fill="outline">{{ $t("Change Store")}}</ion-button>
             </ion-item>
@@ -156,14 +156,15 @@ export default defineComponent({
       deliveryMethod: 'user/getDeliveryMethod',
     })
   },
+  props: ["token"],
   async mounted() {
     if (Object.keys(this.$route.query).length > 0) {
-      if(!this.$route.query.oms || !this.$route.query.token) {
+      if(!this.$route.query.oms || !this.token) {
         // invalid request
         return;
       }
       initialise({
-        token: this.$route.query.token,
+        token: "",  // Not passing token, as in this app we don't want to send the token in the Authorizartion header and instead the token will be passed in the params/body
         instanceUrl: `${this.$route.query.oms}/api/`,
         cacheMaxAge: this.maxAge,
         events: {
@@ -172,6 +173,7 @@ export default defineComponent({
           }
         }
       })
+      this.store.dispatch("user/setUserInstanceUrl", `${this.$route.query.oms}/api/`)
       await this.getOrder();
     }
   },
@@ -194,9 +196,15 @@ export default defineComponent({
       await this.presentLoader()
       let resp;
       let order
+      if(!this.token) {
+        return;
+      }
+
       try {
-        resp = await OrderService.getOrder();
-        if (!hasError(resp)) {
+        resp = await OrderService.getOrder({
+          token: this.token
+        });
+        if (!hasError(resp) && resp.data.id) {
           order = resp.data;
           const productIds: any = new Set();
           order.shipGroup = order.shipGroup.filter((group: any) => {
@@ -211,7 +219,7 @@ export default defineComponent({
             }
           })
           if (productIds.length) await this.fetchProducts([...productIds])
-          await this.store.dispatch("user/getConfiguration", order.productStoreId);
+          await this.store.dispatch("user/getConfiguration", { productStoreId: order.productStoreId, token: this.token});
           this.order = order;
           if (productIds.size) await this.fetchProducts([...productIds])
         }
@@ -260,7 +268,8 @@ export default defineComponent({
         "city": shipGroup.updatedAddress.city,
         "stateProvinceGeoId": shipGroup.updatedAddress.stateProvinceGeoId,
         "postalCode": shipGroup.updatedAddress.postalCode,
-        "countryGeoId": shipGroup.updatedAddress.countryGeoId
+        "countryGeoId": shipGroup.updatedAddress.countryGeoId,
+        "token": this.token
       } as any
 
       if (shipGroup.selectedShipmentMethodTypeId === shipGroup.shipmentMethodTypeId) {
@@ -294,6 +303,7 @@ export default defineComponent({
         "shipmentMethod": "STOREPICKUP@_NA_@CARRIER", // TODO Check why CARRIER is needed
         "contactMechPurposeTypeId": "SHIPPING_LOCATION",
         "facilityId": shipGroup.selectedFacility.facilityId,
+        "token": this.token
       }
 
       try {
@@ -327,6 +337,7 @@ export default defineComponent({
           backdropDismiss: false,
           componentProps: {
             shipGroup,
+            token: this.token
           }
         })
       modal.onDidDismiss().then((result) => {
@@ -386,7 +397,8 @@ export default defineComponent({
       const payload = {
         "orderId": this.order.id,
         "shipGroupSeqId": shipGroup.shipGroupSeqId,
-        "itemReasonMap": itemReasonMap
+        "itemReasonMap": itemReasonMap,
+        "token": this.token
       } as any
 
       try {
diff --git a/src/views/PickupLocationModal.vue b/src/views/PickupLocationModal.vue
index 8bcb84fb..e103804d 100644
--- a/src/views/PickupLocationModal.vue
+++ b/src/views/PickupLocationModal.vue
@@ -18,7 +18,7 @@
         <ion-list>
           <ion-label>{{ shipGroup.shipTo.postalAddress.toName }}</ion-label>
           <ion-label color="dark">{{ shipGroup.shipTo.postalAddress.address1 }} </ion-label>
-          <ion-label color="dark">{{ shipGroup.shipTo.postalAddress.city }} {{ shipGroup.shipTo.postalAddress.country }} {{ shipGroup.shipTo.postalAddress.postalCode }}</ion-label>
+          <ion-label color="dark">{{ shipGroup.shipTo.postalAddress.city }} {{ shipGroup.shipTo.postalAddress.stateCode }} {{ shipGroup.shipTo.postalAddress.country }} {{ shipGroup.shipTo.postalAddress.postalCode }}</ion-label>
         </ion-list>
       </ion-item>
     </ion-card>