diff --git a/.firebaserc b/.firebaserc
index a10899b97..c395b65c6 100644
--- a/.firebaserc
+++ b/.firebaserc
@@ -1,23 +1,20 @@
 {
   "projects": {
-    "default": "hotwax-digital-commerce",
+    "uat": "hotwax-digital-commerce-uat",
     "production": "digital-commerce-71eb8"
   },
   "targets": {
-    "hotwax-digital-commerce": {
+    "hotwax-digital-commerce-uat": {
       "hosting": {
-        "dev": [
-          "dev-reroute-fulfilment"
-        ],
         "uat": [
-          "reroute-fulfilment-uat"
+          "gorjana-reroute-fulfilment-uat"
         ]
       }
     },
     "digital-commerce-71eb8": {
       "hosting": {
         "prod": [
-          "reroute-fulfilment"
+          "gorjana-reroute-fulfilment"
         ]
       }
     }
diff --git a/src/assets/images/background.jpg b/src/assets/images/background.jpg
new file mode 100644
index 000000000..072f53e44
Binary files /dev/null and b/src/assets/images/background.jpg differ
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 986b8fedc..efabf4958 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -1,53 +1,60 @@
 {
   "Add address": "Add address",
+  "Address": "Address",
   "An email will be sent to you when your item(s) are ready to collect at the new requested location(s).": "An email will be sent to you when your item(s) are ready to collect at the new requested location(s).",
-  "Are you sure you want to save the changes?": "Are you sure you want to save the changes?",
+  "Apartment, Suite, etc.": "Apartment, Suite, etc.",
   "Are you sure you want to cancel the order items?": "Are you sure you want to cancel the order items?",
+  "Are you sure you want to save the changes?": "Are you sure you want to save the changes?",
   "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.",
-  "Delivery method": "Delivery method",
+  "Confirm": "Confirm",
+  "Delivery Method": "Delivery Method",
   "Don't Cancel": "Don't Cancel",
   "Edit address": "Edit address",
+  "Edit Zip Code": "Edit Zip Code",
   "Estimated delivery": "Estimated delivery",
   "Existing facility selected again, please select a different facility": "Existing facility selected again, please select a different facility",
-  "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",
+  "Failed to update the shipping address": "Failed to update the shipping address",
   "Fetching address": "Fetching address",
+  "Fetching order details.": "Fetching order details.",
+  "Fetching stores.": "Fetching stores.",
+  "Find Stores": "Find Stores",
+  "First Name": "First Name",
   "Inventory not available at any nearby store, please select alternate delivery method": "Inventory not available at any nearby store, please select alternate delivery method",
-  "Last name": "Last name",
+  "Last Name": "Last Name",
   "Login": "Login",
   "Logout": "Logout",
-  "mi": "mi",
-  "Nearby stores": "Nearby stores",
+  "miles": "miles",
+  "Nearby Stores": "Nearby Stores",
+  "No stores found": "No stores found",
   "OMS": "OMS",
-  "Order ID": "Order ID",
   "Order cancelled successfully": "Order cancelled successfully",
   "Order item not eligible for reroute fulfilment": "Order item not eligible for reroute fulfilment",
+  "Order ID": "Order ID",
   "Order not found": "Order not found",
-  "Shipment has been cancelled": "Shipment has been cancelled",
   "Password": "Password",
   "Please fill all the fields": "Please fill all the fields",
   "Save changes": "Save changes",
   "Save shipping address": "Save shipping address",
-  "Select pickup location": "Select pickup location",
-  "Shipping address": "Shipping address",
-  "Showing pickup locations near": "Showing pickup locations near",
+  "Search for a postal code to check for pickup stores": "Search for a postal code to check for pickup stores",
+  "Search Zip Code": "Search Zip Code",
+  "Select Pickup Location": "Select Pickup Location",
+  "Settings": "Settings",
+  "Shipment has been cancelled": "Shipment has been cancelled",
+  "Shipping Address": "Shipping Address",
+  "Showing pickup locations near": "Showing pickup locations near ",
   "Something went wrong while fetching stores": "Something went wrong while fetching stores",
   "Something went wrong while fetching the order details": "Something went wrong while fetching the order details",
-  "Settings": "Settings",
   "State": "State",
-  "Street": "Street",
   "Tracking code": "Tracking code",
   "Username": "Username",
   "Your Order": "Your Order",
-  "Zipcode": "Zipcode"
+  "Zip Code": "Zip Code",
+  "Zip code not found or invalid": "Zip code not found or invalid"
 }
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index f78422ecb..0921b0302 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -50,7 +50,7 @@ app.config.globalProperties.$filters = {
   formatDate(value: any, inFormat?: string, outFormat?: string) {
     // TODO Use Loxon instead
     // TODO Make default format configurable and from environment variables
-    return moment(value, inFormat).format(outFormat ? outFormat : 'MM-DD-YYYY');
+    return moment(value, inFormat).format(outFormat ? outFormat : 'MM/DD/YYYY');
   },
   formatUtcDate(value: any, inFormat?: string, outFormat?: string) {
     // TODO Use Loxon instead
diff --git a/src/services/OrderService.ts b/src/services/OrderService.ts
index 5a34501d8..c3ac5ce9e 100644
--- a/src/services/OrderService.ts
+++ b/src/services/OrderService.ts
@@ -43,8 +43,17 @@ const getProductStoreSetting = async (payload: any): Promise<any> => {
   });
 }
 
+const getRerouteOrderBrokeringHistory = async (payload: any): Promise<any> => {
+  return api({
+    url: "getRerouteOrderBrokeringHistory",
+    method: "post",
+    data: payload
+  });
+}
+
 export const OrderService = {
   getOrder,
+  getRerouteOrderBrokeringHistory,
   updateShippingAddress,
   updatePickupFacility,
   cancelOrderItem,
diff --git a/src/theme/variables.css b/src/theme/variables.css
index 1cbe9872e..76e73310e 100644
--- a/src/theme/variables.css
+++ b/src/theme/variables.css
@@ -3,13 +3,16 @@ http://ionicframework.com/docs/theming/ */
 
 /** Ionic CSS Variables **/
 :root {
-  /** primary **/
-  --ion-color-primary: #3880ff;
-  --ion-color-primary-rgb: 56, 128, 255;
+  /** Font **/
+  --ion-font-family: 'Futura', -apple-system, BlinkMacSystemFont, 'Helvetica Neue', 'Roboto', sans-serif;
+
+  /** primary: made primary color to black **/
+  --ion-color-primary: #222428;
+  --ion-color-primary-rgb: 34, 36, 40;
   --ion-color-primary-contrast: #ffffff;
   --ion-color-primary-contrast-rgb: 255, 255, 255;
-  --ion-color-primary-shade: #3171e0;
-  --ion-color-primary-tint: #4c8dff;
+  --ion-color-primary-shade: #1e2023;
+  --ion-color-primary-tint: #383a3e;
 
   /** secondary **/
   --ion-color-secondary: #3dc2ff;
@@ -51,14 +54,6 @@ http://ionicframework.com/docs/theming/ */
   --ion-color-danger-shade: #cf3c4f;
   --ion-color-danger-tint: #ed576b;
 
-  /** dark **/
-  --ion-color-dark: #222428;
-  --ion-color-dark-rgb: 34, 36, 40;
-  --ion-color-dark-contrast: #ffffff;
-  --ion-color-dark-contrast-rgb: 255, 255, 255;
-  --ion-color-dark-shade: #1e2023;
-  --ion-color-dark-tint: #383a3e;
-
   /** medium **/
   --ion-color-medium: #92949c;
   --ion-color-medium-rgb: 146, 148, 156;
diff --git a/src/views/AddressModal.vue b/src/views/AddressModal.vue
index 2135cfd05..9455bd058 100644
--- a/src/views/AddressModal.vue
+++ b/src/views/AddressModal.vue
@@ -1,7 +1,7 @@
 <template>
   <ion-header>
     <ion-toolbar>
-      <ion-title>{{ $t("Shipping address") }}</ion-title>
+      <ion-title>{{ $t("Shipping Address") }}</ion-title>
       <ion-buttons slot="end" @click="close()">
         <ion-button>
           <ion-icon :icon="closeOutline" />
@@ -12,13 +12,16 @@
   <ion-content>
     <ion-list>
       <ion-item>
-        <ion-input :label="$t('First name')" class="ion-text-right" name="firstName" v-model="address.firstName" id="firstName" type="text"/>
+        <ion-input :label="$t('First Name')" class="ion-text-right" name="firstName" v-model="address.firstName" id="firstName" type="text"/>
       </ion-item>
       <ion-item>
-        <ion-input :label="$t('Last name')" class="ion-text-right" name="lastName" v-model="address.lastName" id="lastName" type="text"/>
+        <ion-input :label="$t('Last Name')" class="ion-text-right" name="lastName" v-model="address.lastName" id="lastName" type="text"/>
       </ion-item>
       <ion-item>
-        <ion-input :label="$t('Street')" class="ion-text-right" name="street" v-model="address.address1" id="address1" type="text"/>
+        <ion-input :label="$t('Address')" class="ion-text-right" name="street" v-model="address.address1" id="address1" type="text"/>
+      </ion-item>
+      <ion-item>
+        <ion-input :label="$t('Apartment, Suite, etc.')" class="ion-text-right" name="street" v-model="address.address2" id="address2" type="text"/>
       </ion-item>
       <ion-item>
         <ion-input :label="$t('City')" class="ion-text-right" name="city" v-model="address.city" id="city" type="text"/>
@@ -29,7 +32,7 @@
         </ion-select>
       </ion-item>
       <ion-item>
-        <ion-input :label="$t('Zipcode')" class="ion-text-right" name="zipcode" v-model="address.postalCode" id="postalCode"/>
+        <ion-input :label="$t('Zip Code')" class="ion-text-right" name="zipcode" v-model="address.postalCode" id="postalCode"/>
       </ion-item>
     </ion-list>
     <div class="ion-text-center">
@@ -85,6 +88,7 @@ export default defineComponent({
         firstName: "",
         lastName: "",
         address1: "",
+        address2: "",
         city: "",
         stateProvinceGeoId: "",
         postalCode: "",
@@ -106,7 +110,7 @@ export default defineComponent({
     async updateAddress() {
       const hasEmptyValues = Object.keys(this.address).some((field: string) => {
         this.address[field] = this.address[field].trim();
-        return !this.address[field];
+        return !this.address[field] && field !== 'address2';
       })
       if (hasEmptyValues) return showToast(translate("Please fill all the fields"))
       const state = this.states.find((state: any) => state.geoId === this.address.stateProvinceGeoId);
@@ -122,6 +126,7 @@ export default defineComponent({
       }
 
       this.address.address1 = this.shipGroup.shipTo.postalAddress.address1
+      this.address.address2 = this.shipGroup.shipTo.postalAddress.address2
       this.address.city = this.shipGroup.shipTo.postalAddress.city
       this.address.postalCode = this.shipGroup.shipTo.postalAddress.postalCode
       this.address.stateProvinceGeoId = this.shipGroup.shipTo.postalAddress.stateProvinceGeoId
@@ -137,7 +142,7 @@ export default defineComponent({
         const payload = {
           "token": this.token,
           "countryGeoId": this.shipGroup.shipTo.postalAddress.countryGeoId,
-          "viewSize": process.env.VUE_APP_VIEW_SIZE
+          "viewSize": 100
         }
         const resp = await UtilityService.getAssociatedStates(payload);
         if (!hasError(resp)) {
@@ -172,4 +177,12 @@ export default defineComponent({
     return { closeOutline, router, store };
   }
 });
-</script>
\ No newline at end of file
+</script>
+
+<style>
+/* Removes the background color on autofill of input fields */
+input:-webkit-autofill,
+input:-webkit-autofill:focus {
+  transition: background-color 0s 600000s, color 0s 600000s !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Order.vue b/src/views/Order.vue
index 498d80f09..310c1af31 100644
--- a/src/views/Order.vue
+++ b/src/views/Order.vue
@@ -2,6 +2,9 @@
   <ion-page>
     <ion-content :fullscreen="true">
       <main>
+        <ion-thumbnail class="brand-logo">
+          <img src="../assets/images/brand-logo.svg" />
+        </ion-thumbnail>
         <div v-if="Object.keys(order).length">
           <ion-item class="ion-text-center" lines="none">
             <h1>{{ $t("Your Order") }}</h1>
@@ -10,72 +13,76 @@
             <ion-item lines="none" class="border">
               <ion-label>
                 {{ order.customerName }}
-                <p>{{ order.id }}</p>
+                <p>{{ order.orderName }}</p>
               </ion-label>
               <ion-note slot="end">{{ $filters.formatDate(order.orderDate) }}</ion-note>
             </ion-item>
           </ion-card>
           <div v-if="order.statusId !== 'ORDER_CANCELLED' && order.shipGroup.length > 0" >
-            <ion-card v-for="(shipGroup, index) of order.shipGroup" :key="index">
-              <ion-item v-show="item.status !== 'ITEM_CANCELLED'" v-for="item of shipGroup.items" :key="item.id" lines="full">
-                <ion-thumbnail slot="start">
-                  <Image :src='getProduct(item.productId).mainImageUrl' />
-                </ion-thumbnail>
-                <ion-label slot="start">
-                  <p>{{ item.brandName }}</p>
-                  <h2>{{ item.name }}</h2>
-                  <p v-for="(attribute, feature) in ($filters.groupFeatures(getProduct(item.productId).featureHierarchy))" :key="attribute" >
-                    <span class="sentence-case">{{ feature }}</span>: {{ attribute }}
-                  </p>
-                </ion-label>
-              </ion-item>
-              <!-- TODO -->
-              <!-- <ion-item>
-                <ion-label>
-                  status description
-                </ion-label>
-              </ion-item> -->
-              <ion-item>
-                <ion-select :label="$t('Delivery method')" :disabled="!hasPermission(Actions.APP_SHPGRP_DLVRMTHD_UPDATE)" interface="popover" :value="shipGroup.selectedShipmentMethodTypeId" @ionChange="updateDeliveryMethod($event, shipGroup)">
-                  <ion-select-option v-for="method in deliveryMethods" :key="method.value" :value="method.value">{{ method.name }}</ion-select-option>
-                </ion-select>
-              </ion-item>
-              <ion-button v-if="shipGroup.shipmentMethodTypeId === 'STOREPICKUP' && shipGroup.selectedShipmentMethodTypeId !== shipGroup.shipmentMethodTypeId && !shipGroup.updatedAddress" :disabled="!hasPermission(Actions.APP_SHPGRP_DLVRADR_UPDATE) && shipGroup.shipmentMethodTypeId !== 'STOREPICKUP'" @click="updateDeliveryAddress(shipGroup)" expand="block" fill="outline">{{ $t("Add address") }}</ion-button>
-              <ion-button v-else-if="shipGroup.selectedShipmentMethodTypeId === 'STOREPICKUP' && !shipGroup.selectedFacility" :disabled="!hasPermission(Actions.APP_SHPGRP_PCKUP_UPDATE) && shipGroup.shipmentMethodTypeId === 'STOREPICKUP'" @click="updatePickupLocation(shipGroup)" expand="block" fill="outline" class="ion-padding">{{ $t("Select pickup location")}}</ion-button>
-              <ion-item v-else-if="shipGroup.selectedShipmentMethodTypeId === 'STOREPICKUP'">
-                <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.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>
-              <ion-item v-else>
-                <ion-list v-if="shipGroup.updatedAddress">
-                  <ion-label>{{ shipGroup.updatedAddress.firstName }} {{ shipGroup.updatedAddress.lastName }}</ion-label>
-                  <ion-label color="dark">{{ shipGroup.updatedAddress.address1 }} </ion-label>
-                  <ion-label color="dark">{{ shipGroup.updatedAddress.city }} {{ shipGroup.updatedAddress.stateCode }} {{ shipGroup.updatedAddress.postalCode }}</ion-label>
-                </ion-list>
-                <ion-list v-else-if="shipGroup.shipmentMethodTypeId !== 'STOREPICKUP'">
-                  <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.stateCode }} {{ shipGroup.shipTo.postalAddress.postalCode }}</ion-label>
-                </ion-list>
-                <ion-button :disabled="!hasPermission(Actions.APP_SHPGRP_DLVRADR_UPDATE) && shipGroup.shipmentMethodTypeId !== 'STOREPICKUP'" v-if="shipGroup.shipmentMethodTypeId !== 'STOREPICKUP' || shipGroup.updatedAddress" slot="end" @click="updateDeliveryAddress(shipGroup)" color="medium" fill="outline">{{ $t("Edit address") }}</ion-button>
-              </ion-item>
-              <!-- TODO -->
-              <!-- <ion-item v-if="shipGroup.selectedShipmentMethodTypeId !== 'STOREPICKUP'" lines="none">
-                <ion-label>{{ $t("Estimated delivery") }}</ion-label>
-                <ion-label slot="end">{{ $t("03/03/2023") }}</ion-label>
-              </ion-item> -->
-              <ion-item v-if="shipGroup.trackingNumber">
-                <ion-label>{{ $t('Tracking code') }}</ion-label>
-                <ion-note slot="end">{{ shipGroup.trackingNumber }}</ion-note>
-              </ion-item>
+            <div v-for="(shipGroup, index) of order.shipGroup" :key="index">
+              <ion-card>
+                <ion-item v-show="item.status !== 'ITEM_CANCELLED'" v-for="item of shipGroup.items" :key="item.id" lines="none">
+                  <ion-thumbnail slot="start">
+                    <Image :src='getProduct(item.productId).mainImageUrl' />
+                  </ion-thumbnail>
+                  <ion-label>
+                    <h2>{{ getProduct(item.productId).parentProductName || getProduct(item.productId).productName }}</h2>
+                    <p v-for="(attribute, feature) in ($filters.groupFeatures(getProduct(item.productId).featureHierarchy))" :key="attribute" >
+                      <span class="sentence-case">{{ feature }}</span>: {{ attribute }}
+                    </p>
+                  </ion-label>
+                </ion-item>
+                <!-- TODO -->
+                <!-- <ion-item>
+                  <ion-label>
+                    status description
+                  </ion-label>
+                </ion-item> -->
+                <ion-item>
+                  <ion-select :label="$t('Delivery Method')" :disabled="!hasPermission(Actions.APP_SHPGRP_DLVRMTHD_UPDATE)" interface="popover" :value="shipGroup.selectedShipmentMethodTypeId" @ionChange="updateDeliveryMethod($event, shipGroup)">
+                    <ion-select-option v-for="method in deliveryMethods" :key="method.value" :value="method.value">{{ method.name }}</ion-select-option>
+                  </ion-select>
+                </ion-item>
+                <ion-button v-if="shipGroup.shipmentMethodTypeId === 'STOREPICKUP' && shipGroup.selectedShipmentMethodTypeId !== shipGroup.shipmentMethodTypeId && !shipGroup.updatedAddress" :disabled="!hasPermission(Actions.APP_SHPGRP_DLVRADR_UPDATE) && shipGroup.shipmentMethodTypeId !== 'STOREPICKUP'" @click="updateDeliveryAddress(shipGroup)" expand="block" fill="outline" class="ion-margin">{{ $t("Add address") }}</ion-button>
+                <ion-button v-else-if="shipGroup.selectedShipmentMethodTypeId === 'STOREPICKUP' && !shipGroup.selectedFacility" :disabled="!hasPermission(Actions.APP_SHPGRP_PCKUP_UPDATE) && shipGroup.shipmentMethodTypeId === 'STOREPICKUP'" @click="updatePickupLocation(shipGroup)" expand="block" fill="outline" class="ion-margin">{{ $t("Select Pickup Location")}}</ion-button>
+                <ion-item v-else-if="shipGroup.selectedShipmentMethodTypeId === 'STOREPICKUP'">
+                  <ion-list>
+                    <ion-label>{{ shipGroup.selectedFacility.facilityName }} </ion-label>
+                    <ion-label color="dark">{{ shipGroup.selectedFacility.address1 }} </ion-label>
+                    <ion-label color="dark">{{ shipGroup.selectedFacility.address2 }} </ion-label>
+                    <ion-label color="dark">{{ shipGroup.selectedFacility.city }}{{ 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>
+                <ion-item v-else>
+                  <ion-list v-if="shipGroup.updatedAddress">
+                    <ion-label>{{ shipGroup.updatedAddress.firstName }} {{ shipGroup.updatedAddress.lastName }}</ion-label>
+                    <ion-label color="dark">{{ shipGroup.updatedAddress.address1 }} </ion-label>
+                    <ion-label color="dark">{{ shipGroup.updatedAddress.address2 }} </ion-label>
+                    <ion-label color="dark">{{ shipGroup.updatedAddress.city }}{{ shipGroup.updatedAddress.city && ',' }} {{ shipGroup.updatedAddress.stateCode }} {{ shipGroup.updatedAddress.postalCode }}</ion-label>
+                  </ion-list>
+                  <ion-list v-else-if="shipGroup.shipmentMethodTypeId !== 'STOREPICKUP'">
+                    <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.address2 }} </ion-label>
+                    <ion-label color="dark">{{ shipGroup.shipTo.postalAddress.city }}{{ shipGroup.shipTo.postalAddress.city && ',' }} {{ shipGroup.shipTo.postalAddress.stateCode }} {{ shipGroup.shipTo.postalAddress.postalCode }}</ion-label>
+                  </ion-list>
+                  <ion-button :disabled="!hasPermission(Actions.APP_SHPGRP_DLVRADR_UPDATE) && shipGroup.shipmentMethodTypeId !== 'STOREPICKUP'" v-if="shipGroup.shipmentMethodTypeId !== 'STOREPICKUP' || shipGroup.updatedAddress" slot="end" @click="updateDeliveryAddress(shipGroup)" color="medium" fill="outline">{{ $t("Edit address") }}</ion-button>
+                </ion-item>
+                <!-- TODO -->
+                <!-- <ion-item v-if="shipGroup.selectedShipmentMethodTypeId !== 'STOREPICKUP'" lines="none">
+                  <ion-label>{{ $t("Estimated delivery") }}</ion-label>
+                  <ion-label slot="end">{{ $t("03/03/2023") }}</ion-label>
+                </ion-item> -->
+                <ion-item v-if="shipGroup.trackingNumber">
+                  <ion-label>{{ $t('Tracking code') }}</ion-label>
+                  <ion-note slot="end">{{ shipGroup.trackingNumber }}</ion-note>
+                </ion-item>
+              </ion-card>
               <!-- Disabling the buttons if address or facility is not added -->
-              <ion-button :disabled="(!shipGroup.updatedAddress && (!shipGroup.selectedFacility || shipGroup.selectedFacility.facilityId == shipGroup.facilityId))" @click="save(shipGroup)" fill="clear">{{ $t("Save changes") }}</ion-button>
-              <ion-button v-if="hasPermission(Actions.APP_SHPGRP_CNCL)" @click="cancel(shipGroup)" fill="clear" color="danger">{{ $t("Cancel") }}</ion-button>
-            </ion-card>
+              <ion-button class="ion-margin" expand="block" :disabled="(!shipGroup.updatedAddress && (!shipGroup.selectedFacility || shipGroup.selectedFacility.facilityId == shipGroup.facilityId))" @click="save(shipGroup)">{{ $t("Save changes") }}</ion-button>
+              <ion-button class="ion-margin" expand="block" v-if="hasPermission(Actions.APP_SHPGRP_CNCL)" @click="cancel(shipGroup)" fill="outline" color="danger">{{ $t("Cancel") }}</ion-button>
+            </div>
           </div>
           <div v-else-if="isOrderUpdated" class="ion-text-center ion-padding-top">
             <ion-label>{{ $t("An email will be sent to you when your item(s) are ready to collect at the new requested location(s).") }}</ion-label>
@@ -121,6 +128,7 @@ import { ProductService } from "@/services/ProductService";
 import PickupLocationModal from "@/views/PickupLocationModal.vue";
 import { Actions, hasPermission } from '@/authorization'
 import { initialise } from '@/adapter'
+import { FacilityService } from "@/services/FacilityService";
 
 export default defineComponent({
   name: "Order",
@@ -146,15 +154,17 @@ export default defineComponent({
       products: {} as any,
       deliveryMethods: [
         {
-          name: 'Store pickup',
+          name: 'In-Store Pickup',
           value: 'STOREPICKUP'
         },
         {
-          name: 'Shipping',
+          name: 'Ship To Me',
           value: 'STANDARD'
         }
       ],
-      isOrderUpdated: false
+      isOrderUpdated: false,
+      originFacilityId: "",
+      lastRejectedFacility: {} as any
     }
   },
   computed: {
@@ -271,6 +281,7 @@ export default defineComponent({
         "facilityId": shipGroup.facilityId,
         "toName": `${shipGroup.updatedAddress.firstName} ${shipGroup.updatedAddress.lastName}`,
         "address1": shipGroup.updatedAddress.address1,
+        "address2": shipGroup.updatedAddress.address2,
         "city": shipGroup.updatedAddress.city,
         "stateProvinceGeoId": shipGroup.updatedAddress.stateProvinceGeoId,
         "postalCode": shipGroup.updatedAddress.postalCode,
@@ -292,11 +303,11 @@ export default defineComponent({
           showToast(translate("Changes saved"))
           this.isOrderUpdated = true
         } else {
-          showToast(translate("Failed to update the shipping addess"))
+          showToast(translate("Failed to update the shipping address"))
         }
       } catch (error) {
         console.error(error)
-        showToast(translate("Failed to update the shipping addess"))
+        showToast(translate("Failed to update the shipping address"))
       }
       this.getOrder();
     },
@@ -356,8 +367,47 @@ export default defineComponent({
       });
       return modal.present();
     },
+    async fetchOrderFacilityChangeHistory() {
+      try {
+        let resp = await OrderService.getRerouteOrderBrokeringHistory({ "token": this.token })
+
+        if(!hasError(resp) && resp.data?.brokeringHistory.length) {
+          const oldestBrokeringHistory = resp.data.brokeringHistory.reduce((oldest: any, current: any) => current.changeDatetime > oldest.changeDatetime ? current : oldest);
 
+          this.originFacilityId = oldestBrokeringHistory.facilityId;
+        } else {
+          throw resp.data;
+        }
+      } catch(error: any) {
+        console.error(error);
+      }
+    },
+    async getStoreByFacilityId(facilityId: string) {
+      let facility = {};
+      let payload = {
+        "viewSize": process.env.VUE_APP_VIEW_SIZE,
+        "filters": [`storeCode: ${facilityId}`, "pickup_pref: true"]
+      } as any
+
+      try {
+        const storeLookupResp = await FacilityService.getStores(payload)
+        if (hasError(storeLookupResp) || !storeLookupResp.data.response.numFound) {
+          return facility;
+        }
+        facility = storeLookupResp.data.response.docs[0]
+      } catch (error) {
+        console.error(error)
+      }
+      return facility;
+    },
     async updatePickupLocation(shipGroup: any) {
+      // If we already have the facility location for the last brokered facility then do not fetch the same information again
+      if(!this.lastRejectedFacility?.storeCode) {
+        // Fetch the last facilityId from where the order was rejected
+        await this.fetchOrderFacilityChangeHistory();
+        this.lastRejectedFacility = await this.getStoreByFacilityId(this.originFacilityId);
+      }
+
       const modal = await modalController
         .create({
           component: PickupLocationModal,
@@ -365,7 +415,9 @@ export default defineComponent({
           // backrop.role returns 'backdrop' giving unexpected result
           backdropDismiss: false,
           componentProps: {
-            shipGroup
+            shipGroup,
+            storePickupRejectedFacility: this.lastRejectedFacility,
+            shipGroupSelectedFacility: shipGroup.selectedFacility
           }
         })
       modal.onDidDismiss().then((result) => {
@@ -419,7 +471,7 @@ export default defineComponent({
         }
       } catch (error) {
         console.error(error)
-        showToast(translate("Failed~ to cancel the order"))
+        showToast(translate("Failed to cancel the order"))
       }
       this.getOrder();
     },
@@ -463,6 +515,30 @@ export default defineComponent({
 </script>
 
 <style scoped>
+  ion-thumbnail.brand-logo {
+    height: 100px;
+    width: 90%;
+    margin: auto;
+  }
+
+  ion-content {
+    background-image: url("@/assets/images/background.jpg");
+    background-size: cover;
+    --background: transparent;
+  }
+
+  main {
+    position: relative;
+    top: 50%;
+    transform: translateY(-50%);
+    background: white;
+    padding: 20px;
+  }
+
+  ion-item > h1 {
+    width: 100%;
+  }
+
   @media (min-width: 700px) {
     main {
       max-width: 400px;
diff --git a/src/views/PickupLocationModal.vue b/src/views/PickupLocationModal.vue
index 54fced91f..8972a578e 100644
--- a/src/views/PickupLocationModal.vue
+++ b/src/views/PickupLocationModal.vue
@@ -6,56 +6,100 @@
           <ion-icon :icon="closeOutline" />
         </ion-button>
       </ion-buttons>
-      <ion-title>{{ $t("Select pickup location") }}</ion-title>
+      <ion-title>{{ $t("Select Pickup Location") }}</ion-title>
     </ion-toolbar>
   </ion-header>
   <ion-content>
-    <ion-card v-if="shipGroup.shipmentMethodTypeId !== 'STOREPICKUP'">
+    <ion-accordion-group v-if="!isSearchingEnabled">
+      <ion-accordion value="rejectedFacility" v-if="shipGroup.shipmentMethodTypeId === 'STOREPICKUP'">
+        <ion-item slot="header" color="light">
+          <ion-icon slot="start" :icon="locationOutline"></ion-icon>
+          <ion-label>{{ $t("Showing pickup locations near") }} {{ storePickupRejectedFacility.postalCode }}</ion-label>
+        </ion-item>
+        <ion-item slot="content" lines="none">
+          <ion-label slot="start">
+            {{ storePickupRejectedFacility.storeName }}
+            <p>{{ storePickupRejectedFacility.address1 }}</p>
+            <p>{{ storePickupRejectedFacility.address2 }}</p>
+            <p>{{ storePickupRejectedFacility.city }}{{ storePickupRejectedFacility.city && storePickupRejectedFacility.state ? ", " : "" }}{{ storePickupRejectedFacility.state }} {{ storePickupRejectedFacility.postalCode }}</p>
+          </ion-label>
+          <ion-button fill="clear" slot="end" @click="enableSearching">
+            {{ $t("Edit Zip Code") }}
+          </ion-button>
+        </ion-item>
+      </ion-accordion>
+      <ion-accordion value="rejectedFacility" v-else>
+        <ion-item slot="header" color="light">
+          <ion-icon slot="start" :icon="locationOutline"></ion-icon>
+          <ion-label>{{ $t("Showing pickup locations near") }} {{ shipGroup.shipTo.postalAddress.postalCode }}</ion-label>
+        </ion-item>
+        <ion-item slot="content" lines="none">
+          <ion-label slot="start">
+            {{ shipGroup.shipTo.postalAddress.toName }}
+            <p>{{ shipGroup.shipTo.postalAddress.address1 }}</p>
+            <p>{{ shipGroup.shipTo.postalAddress.address2 }}</p>
+            <p>{{ shipGroup.shipTo.postalAddress.city }}{{ shipGroup.shipTo.postalAddress.city && shipGroup.shipTo.postalAddress.stateCode ? ", " : "" }}{{ shipGroup.shipTo.postalAddress.stateCode }} {{ shipGroup.shipTo.postalAddress.country }} {{ shipGroup.shipTo.postalAddress.postalCode }}</p>
+          </ion-label>
+          <ion-button fill="clear" slot="end" @click="enableSearching">
+            {{ $t("Edit Zip Code") }}
+          </ion-button>
+        </ion-item>
+      </ion-accordion>
+    </ion-accordion-group>
+    <form
+      v-else
+      @submit.prevent="searchStores()"
+    >
+      <ion-searchbar :placeholder="$t('Search Zip Code')" v-model="queryString" />
+      <ion-button class="ion-margin" type="submit" expand="block">{{ $t("Find Stores") }}</ion-button>
+    </form>
+
+    <div v-if="isLoadingStores" class="empty-state">
       <ion-item lines="none">
-        <ion-label>{{ $t("Showing pickup locations near") }}</ion-label>
-      </ion-item>
-      <ion-item>
-        <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.stateCode }} {{ shipGroup.shipTo.postalAddress.country }} {{ shipGroup.shipTo.postalAddress.postalCode }}</ion-label>
-        </ion-list>
+        <ion-spinner name="crescent" slot="start" />
+        {{ $t("Fetching stores.") }}
       </ion-item>
-    </ion-card>
-    <ion-list v-if="nearbyStores.length">
+    </div>
+    <ion-list v-else-if="nearbyStores.length">
       <ion-list-header lines="full" color="light">
-        <ion-label>{{ $t("Nearby stores") }}</ion-label>
+        <ion-label>{{ $t("Nearby Stores") }}</ion-label>
       </ion-list-header>
-      <ion-radio-group v-model="selectedFacility">
+      <ion-radio-group :value="selectedFacility?.facilityId" @ionChange="updatePickupStore($event)">
         <ion-item v-for="store of nearbyStores" :key="store.facilityId">
-          <ion-radio :value="store">
+          <ion-radio :value="store.facilityId" label-placement="end">
             <ion-label>
               {{ store.facilityName }}
               <p>{{ store.address1 }}</p>
-              <p>{{ store.city }}{{ store.city && store.state ? ", " : "" }}{{ store.state }}</p>
+              <p>{{ store.address2 }}</p>
+              <p>{{ store.city }}{{ store.city && store.state ? ", " : "" }}{{ store.state }} {{ store.postalCode }}</p>
             </ion-label>
             <!-- Showing store distance in miles -->
-            <ion-label v-if="store.distance">{{ store.distance }} {{ $t("mi") }}</ion-label>
+            <ion-label v-if="store.distance">{{ store.distance }} {{ $t("miles") }}</ion-label>
           </ion-radio>
         </ion-item>
       </ion-radio-group>
     </ion-list>
-    <ion-item v-else lines="none" class="ion-text-center">
-      <ion-label>{{ $t("Inventory not available at any nearby store, please select alternate delivery method") }}</ion-label>
+    <ion-item v-else-if="errorMessage" lines="none" class="ion-text-center">
+      <ion-label>{{ $t(errorMessage) }}</ion-label>
     </ion-item>
-    <!-- Only show select button if there are stores to select from -->
-    <div v-if="nearbyStores.length" class="ion-text-center">
-      <ion-button :disabled="Object.keys(selectedFacility).length == 0 || selectedFacility.facilityId == shipGroup.facilityId"  @click="updateFacility()">{{ $t("Select pickup location") }}</ion-button>
-    </div>
+
+    <ion-fab v-if="nearbyStores.length" vertical="bottom" horizontal="end" slot="fixed">
+      <ion-fab-button :disabled="Object.keys(selectedFacility).length == 0 || selectedFacility?.facilityId == shipGroupSelectedFacility?.facilityId" @click="updateFacility()">
+        <ion-icon :icon="saveOutline" />
+      </ion-fab-button>
+    </ion-fab>
   </ion-content>
 </template>
 
 <script lang="ts">
 import {
+  IonAccordion,
+  IonAccordionGroup,
   IonButton,
   IonButtons,
-  IonCard,
   IonContent,
+  IonFab,
+  IonFabButton,
   IonHeader,
   IonIcon,
   IonItem,
@@ -64,13 +108,14 @@ import {
   IonListHeader,
   IonRadio,
   IonRadioGroup,
+  IonSearchbar,
+  IonSpinner,
   IonTitle,
   IonToolbar,
-  loadingController,
   modalController
 } from '@ionic/vue';
 import { defineComponent } from 'vue';
-import { closeOutline } from 'ionicons/icons';
+import { closeOutline, locationOutline, saveOutline } from 'ionicons/icons';
 import { useRouter } from "vue-router";
 import { useStore } from "@/store";
 import { FacilityService } from '@/services/FacilityService';
@@ -81,10 +126,13 @@ import { UtilityService } from '@/services/UtilityService';
 export default defineComponent({
   name: 'PickupLocationModal',
   components: {
+    IonAccordion,
+    IonAccordionGroup,
     IonButton,
     IonButtons,
-    IonCard,
     IonContent,
+    IonFab,
+    IonFabButton,
     IonHeader,
     IonIcon,
     IonItem,
@@ -93,6 +141,8 @@ export default defineComponent({
     IonLabel,
     IonRadio,
     IonRadioGroup,
+    IonSearchbar,
+    IonSpinner,
     IonTitle,
     IonToolbar
   },
@@ -101,35 +151,45 @@ export default defineComponent({
       loader: null as any,
       nearbyStores: [] as any,
       facilityId: '',
-      selectedFacility: {}
+      selectedFacility: {} as any,
+      isSearchingEnabled: false,  // displays searchbar on the UI
+      queryString: "",
+      isLoadingStores: false,   // displays spinner on UI
+      errorMessage: ""
     }
   },
-  props: ["shipGroup"],
+  watch: {
+    queryString: {
+      async handler() {
+        if (!this.queryString.trim().length) {
+          this.isLoadingStores = true;
+          this.nearbyStores = [];
+          await this.getPickupStores()
+          this.isLoadingStores = false;
+        }
+      },
+    },
+  },
+  props: ["shipGroup", "storePickupRejectedFacility", "shipGroupSelectedFacility"],
   async mounted() {
-    await this.presentLoader()
-    await this.getPickupStores();
-    this.dismissLoader()
-    
+    this.isLoadingStores = true
+
+    if(!this.storePickupRejectedFacility?.storeCode) {
+      this.isSearchingEnabled = true
+    }
+
+    if(this.shipGroupSelectedFacility?.facilityId) {
+      this.selectedFacility = JSON.parse(JSON.stringify(this.shipGroupSelectedFacility))
+    }
+
+    await this.getPickupStores()
+    this.isLoadingStores = false
   },
   methods: {
-    async presentLoader() {
-      this.loader = await loadingController
-        .create({
-          message: this.$t("Fetching stores."),
-          translucent: true,
-        });
-      await this.loader.present();
-    },
-    dismissLoader() {
-      if (this.loader) {
-        this.loader.dismiss();
-        this.loader = null;
-      }
-    },
     async getStores(point?: string) {
       let payload = {
         "viewSize": process.env.VUE_APP_VIEW_SIZE,
-        "filters": ["storeType: RETAIL_STORE", "pickup_pref: true"]
+        "filters": ["storeType: RETAIL_STORE OR WAREHOUSE", "pickup_pref: true"]
       } as any
 
       if (point) {
@@ -147,11 +207,18 @@ export default defineComponent({
       }
     },
 
-    async getDeliveryAddressGeoLocation() {
+    async getDeliveryAddressGeoLocation(postalCode?: string) {
+      if(!postalCode) {
+        return '';
+      }
+
+      const truncatedPostalcode = postalCode.replace(/^0+/, '');
+      const query = postalCode === truncatedPostalcode ? `postcode:${postalCode}` : `postcode:${postalCode} OR ${truncatedPostalcode}`;
+
       try {
         const shipGroupLocationResp = await UtilityService.getGeoLocation({
           "json": {
-            "query": `postcode: ${this.shipGroup.shipTo.postalAddress.postalCode}`
+            "query": query
           }
         })
 
@@ -161,6 +228,7 @@ export default defineComponent({
         return shipGroupLocationResp.data.response.docs[0].location
       } catch (error) {
         console.error(error)
+        return '';
       }
     },
 
@@ -197,32 +265,51 @@ export default defineComponent({
       }
     },
 
+    getStoreDistance(store: any) {
+      return (store.dist || store.dist >= 0) && store.dist !== 'Infinity'
+      ? `${parseFloat((store.dist).toFixed(1)).toLocaleString()}`
+      : "";
+    },
+
+    enableSearching() {
+      this.isSearchingEnabled = true
+      this.nearbyStores = []
+    },
+
     async getPickupStores() {
       try {
         let stores;
         if (this.shipGroup.shipmentMethodTypeId === 'STOREPICKUP') {
-          // shipgroup is in brokering queue in this case so we do not
-          // have any facility hence, all the stores are fetched
-          stores = await this.getStores()
+          stores = await this.getStores(this.storePickupRejectedFacility ? this.storePickupRejectedFacility?.latlon : '')
         } else {
-          const location = await this.getDeliveryAddressGeoLocation()
-          if (!location) return;
+          const location = await this.getDeliveryAddressGeoLocation(this.shipGroup.shipTo.postalAddress.postalCode)
+          if (!location) {
+            this.errorMessage = "Zip code not found or invalid"
+            return;
+          }
           stores = await this.getStores(location)
         }
 
-        if (!stores?.length) return;
+        if (!stores?.length) {
+          this.errorMessage = "No stores found"
+          return;
+        }
 
         const facilityIds = stores.map((store: any) => store.storeCode)
         const productIds = [...new Set(this.shipGroup.items.map((item: any) => item.productId))] as any;
         const storesWithInventory = await this.checkInventory(facilityIds, productIds)
 
-        if (!storesWithInventory?.length) return;
+        if (!storesWithInventory?.length) {
+          this.errorMessage = "Inventory not available at any nearby store, please select alternate delivery method"
+          return;
+        }
 
         stores.map((storeData: any) => {
           const inventoryDetails = storesWithInventory.filter((store: any) => store.facilityId === storeData.storeCode);
-          if (inventoryDetails.length === productIds.length) this.nearbyStores.push({...storeData, ...inventoryDetails[0], distance: storeData.dist });
+          if (inventoryDetails.length === productIds.length) this.nearbyStores.push({...storeData, ...inventoryDetails[0], distance: this.getStoreDistance(storeData) });
         });
       } catch (error) {
+        this.errorMessage = "No stores found"
         console.error(error)
       }
     },
@@ -233,12 +320,65 @@ export default defineComponent({
 
     close(selectedFacility?: any) {
       modalController.dismiss({ dismissed: true }, selectedFacility);
+    },
+
+    async searchStores() {
+      // If the searching is already in progress then clicking the button multiple should not initiate the search again
+      if(this.isLoadingStores) {
+        return;
+      }
+
+      if(!this.queryString.trim().length) {
+        this.errorMessage = "Search for a postal code to check for pickup stores"
+        return;
+      }
+
+      this.isLoadingStores = true;
+      this.nearbyStores = []
+
+      let stores = []
+      const location = await this.getDeliveryAddressGeoLocation(this.queryString.trim())
+      if (!location) {
+        this.isLoadingStores = false;
+        this.errorMessage = "Zip code not found or invalid"
+        return;
+      }
+
+      stores = await this.getStores(location)
+
+      if (!stores?.length) {
+        this.isLoadingStores = false;
+        this.errorMessage = "No stores found"
+        return;
+      }
+
+      const facilityIds = stores.map((store: any) => store.storeCode)
+      const productIds = [...new Set(this.shipGroup.items.map((item: any) => item.productId))] as any;
+      const storesWithInventory = await this.checkInventory(facilityIds, productIds)
+
+      if (!storesWithInventory?.length) {
+        this.isLoadingStores = false;
+        this.errorMessage = "Inventory not available at any nearby store, please select alternate delivery method"
+        return;
+      }
+
+      stores.map((storeData: any) => {
+        const inventoryDetails = storesWithInventory.filter((store: any) => store.facilityId === storeData.storeCode);
+        if (inventoryDetails.length === productIds.length) this.nearbyStores.push({...storeData, ...inventoryDetails[0], distance: this.getStoreDistance(storeData) });
+      });
+
+      this.isLoadingStores = false;
+    },
+
+    updatePickupStore(event: any) {
+      const facilityId = event.detail.value;
+      this.selectedFacility = this.nearbyStores.find((store: any) => store.facilityId === facilityId);
     }
   },
   setup() {
     const router = useRouter();
     const store = useStore();
-    return { closeOutline, router, store };
+    return { closeOutline, locationOutline, saveOutline, router, store };
   }
 });
 </script>
@@ -251,4 +391,17 @@ ion-radio::part(label) {
   align-items: center;
   width: 100%
 }
+
+ion-content {
+  --padding-bottom: 80px;
+}
+
+.empty-state {
+  max-width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 10px;
+}
 </style>
\ No newline at end of file