diff --git a/src/locales/en.json b/src/locales/en.json
index e8626db..9660c8d 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -36,6 +36,7 @@
   "Display current physical quantity expected at locations while inventory counting.": "Display current physical quantity expected at locations while inventory counting.",
   "Edit": "Edit",
   "facilities": "{count} facilities",
+  "facility": "{count} facility",
   "Failed to create product store.": "Failed to create product store.",
   "Failed to remove tag.": "Failed to remove tag.",
   "Failed to update product store name.": "Failed to update product store name.",
@@ -46,7 +47,7 @@
   "Go to OMS": "Go to OMS",
   "Hold pre-order physical inventory": "Hold pre-order physical inventory",
   "ID": "ID",
-  "Id prefix": "Id prefix",
+  "ID prefix": "ID prefix",
   "Identifier": "Identifier",
   "Import": "Import",
   "Inventory": "Inventory",
@@ -85,6 +86,7 @@
   "Product store created successfully.": "Product store created successfully.",
   "Product store configurations updated successfully.": "Product store configurations updated successfully.",
   "Product store ID cannot be more than 20 characters.": "Product store ID cannot be more than 20 characters.",
+  "Product store ID represents an unique ID for your product store": "Product store ID represents an unique ID for your product store",
   "Product store name": "Product store name",
   "Product store name can't be empty.": "Product store name can't be empty.",
   "Product store name updated successfully.": "Product store name updated successfully.",
@@ -99,11 +101,13 @@
   "Search time zones": "Search time zones",
   "Soft Allocation": "Soft Allocation",
   "Secondary identifier": "Secondary identifier",
+  "Select": "Select",
   "Select operating countries": "Select operating countries",
   "Select time zone": "Select time zone",
   "Send notification to Shopify": "Send notification to Shopify",
   "Settings": "Settings",
   "Setup product store": "Setup product store",
+  "shipping method": "{count} shipping method",
   "shipping methods": "{count} shipping methods",
   "Shipment method": "Shipment method",
   "Shipping facility tag": "Shipping facility tag",
diff --git a/src/router/index.ts b/src/router/index.ts
index 1b8b936..110cd5b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -57,7 +57,11 @@ const routes: Array<RouteRecordRaw> = [
   {
     path: "/add-configurations/:productStoreId",
     name: "AddConfigurations",
-    component: AddConfigurations
+    component: AddConfigurations,
+    beforeEnter: (to, from, next) => {
+      if(from.path === "/create-product-store") next()
+      else router.push(from.path)
+    }
   },
   {
     path: "/product-store-details/:productStoreId",
diff --git a/src/services/UserService.ts b/src/services/UserService.ts
index e136c77..009e637 100644
--- a/src/services/UserService.ts
+++ b/src/services/UserService.ts
@@ -49,9 +49,12 @@ const getUserProfile = async (token: any): Promise<any> => {
 }
 
 const getAvailableTimeZones = async (): Promise <any>  => {
-  return api({
+  const url = store.getters["user/getBaseUrl"]
+  const baseURL = url.startsWith('http') ? url.includes('/rest/s1/admin') ? url.replace("admin", "available-to-promise") : `${url}/rest/s1/available-to-promise/` : `https://${url}.hotwax.io/rest/s1/available-to-promise/`;
+  return client({
     url: "user/getAvailableTimeZones",
     method: "get",
+    baseURL,
     cache: true
   });
 }
diff --git a/src/views/AddConfigurations.vue b/src/views/AddConfigurations.vue
index a1dd035..acb7405 100644
--- a/src/views/AddConfigurations.vue
+++ b/src/views/AddConfigurations.vue
@@ -2,7 +2,7 @@
   <ion-page>
     <ion-header>
       <ion-toolbar>
-        <ion-back-button default-href="/tabs/create-product-store" slot="start"></ion-back-button>
+        <ion-back-button default-href="/tabs/product-store" slot="start"></ion-back-button>
         <ion-title>{{ translate("Add configurations") }}</ion-title>
         <ion-buttons slot="end">
           <ion-button slot="icon-only">
@@ -105,7 +105,7 @@ async function setupProductStore() {
     const resp = await ProductStoreService.updateProductStore(payload);
     if(!hasError(resp)) {
       showToast(translate("Product store configurations updated successfully."))
-      router.push(`/product-store-details/${productStore.value.productStoreId}`);
+      router.replace(`/product-store-details/${productStore.value.productStoreId}`);
     } else {
       throw resp.data;
     }
@@ -113,7 +113,6 @@ async function setupProductStore() {
     logger.error(error)
     showToast(translate("Failed to add configurations to the product store."))
   }
-
 }
 </script>
 
diff --git a/src/views/CreateProductStore.vue b/src/views/CreateProductStore.vue
index 465a92d..bedc347 100644
--- a/src/views/CreateProductStore.vue
+++ b/src/views/CreateProductStore.vue
@@ -21,7 +21,7 @@
           </ion-input>
         </ion-item>
         <ion-item lines="none">
-          <ion-input ref="storeId" v-model="formData.productStoreId" @ionChange="validateGroupId($event.detail.value)" @ionBlur="markGroupIdTouched" label-placement="floating" :label="translate('ID')" :errorText="translate('Product store ID cannot be more than 20 characters.')" :helper-text="translate('Product store represents a brand in OMS')" :clear-input="true" />
+          <ion-input ref="storeId" v-model="formData.productStoreId" @ionChange="validateGroupId($event.detail.value)" @ionBlur="markGroupIdTouched" label-placement="floating" :label="translate('ID')" :errorText="translate('Product store ID cannot be more than 20 characters.')" :helper-text="translate('Product store ID represents an unique ID for your product store')" :clear-input="true" />
         </ion-item>
 
         <ion-item  v-if="!dbicCountriesCount">
@@ -126,12 +126,12 @@ async function manageConfigurations() {
       }
 
       showToast(translate("Product store created successfully."))
-      router.push(`add-configurations/${productStoreId}`);
+      router.replace(`add-configurations/${productStoreId}`);
     } else {
       throw resp.data;
     }
   } catch(error: any) {
-    showToast(translate("Failed to create product store."))
+    showToast(translate(error.response?.data?.errors ? error.response.data.errors : "Failed to create product store."))
     logger.error(error);
   } 
 }
diff --git a/src/views/ProductStore.vue b/src/views/ProductStore.vue
index 25bc92e..2865ced 100644
--- a/src/views/ProductStore.vue
+++ b/src/views/ProductStore.vue
@@ -19,14 +19,14 @@
 
           <div class="tablet" @click.stop="">
             <ion-chip outline>
-              <ion-label>{{ translate("facilities", { count: store.facilityCount }) }}</ion-label>
+              <ion-label>{{ translate(store.facilityCount > 1 ? "facilities" : "facility", { count: store.facilityCount }) }}</ion-label>
               <ion-icon :icon="openOutline" color="primary"/>
             </ion-chip>
           </div>
 
           <div class="tablet" @click.stop="">
             <ion-chip outline>
-              <ion-label>{{ translate("shipping methods", { count: store.shipmentMethodCount }) }}</ion-label>
+              <ion-label>{{ translate(store.shipmentMethodCount > 1 ? "shipping methods" : "shipping method", { count: store.shipmentMethodCount }) }}</ion-label>
             </ion-chip>
           </div>
         </div>
diff --git a/src/views/ProductStoreDetails.vue b/src/views/ProductStoreDetails.vue
index 23bcc13..fbce0e8 100644
--- a/src/views/ProductStoreDetails.vue
+++ b/src/views/ProductStoreDetails.vue
@@ -28,7 +28,7 @@
               </ion-item>
 
               <ion-item>
-                <ion-icon :icon="thunderstormOutline" slot="start"/>
+                <ion-icon :icon="compassOutline" slot="start"/>
                 <ion-toggle :checked="getBooleanValue(productStore.enableBrokering)" @click.prevent="updateProductStoreDetail($event, 'enableBrokering', true)">{{ translate("Order brokering") }}</ion-toggle>
               </ion-item>
 
@@ -52,7 +52,7 @@
               </ion-item-divider>
 
               <ion-item>
-                <ion-input :label="translate('Id prefix')" :placeholder="translate('prefix')" :value="productStore.orderNumberPrefix" @keydown.enter="updateProductStoreDetail($event, 'orderNumberPrefix', false)" />
+                <ion-input :label="translate('ID prefix')" :placeholder="translate('prefix')" :value="productStore.orderNumberPrefix" @keydown.enter="updateProductStoreDetail($event, 'orderNumberPrefix', false)" />
               </ion-item>
               <ion-item lines="none">
                 <ion-label>
@@ -245,7 +245,7 @@
               </ion-item>
 
               <ion-item>
-                <ion-select :label="translate('Pre-order group')" interface="popover" :value="settings['PRE_ORDER_GROUP_ID']?.settingValue" @ionChange="updateProductStoreSettings($event, 'PRE_ORDER_GROUP_ID', false)">
+                <ion-select :label="translate('Pre-order group')" interface="popover" :placeholder="translate('Select')" :value="settings['PRE_ORDER_GROUP_ID']?.settingValue" @ionChange="updateProductStoreSettings($event, 'PRE_ORDER_GROUP_ID', false)">
                   <ion-select-option v-for="group in facilityGroups" :key="group.facilityGroupId" :value="group.facilityGroupId">{{ group.facilityGroupName }}</ion-select-option>
                 </ion-select>
               </ion-item>
@@ -268,7 +268,7 @@
               </ion-item-divider>
 
               <ion-item>
-                <ion-select :label="translate('Global identifier')" interface="popover" :value="productStore.productIdentifierEnumId"  @ionChange="updateProductStoreDetail($event, 'productIdentifierEnumId', false)">
+                <ion-select :label="translate('Global identifier')" interface="popover" :placeholder="translate('Select')" :value="productStore.productIdentifierEnumId"  @ionChange="updateProductStoreDetail($event, 'productIdentifierEnumId', false)">
                   <ion-select-option v-for="identifier in productIdentifiers" :key="identifier.enumId" :value="identifier.enumId">{{ identifier.description }}</ion-select-option>
                 </ion-select>
               </ion-item>
@@ -283,13 +283,13 @@
               </ion-item-divider>
 
               <ion-item>
-                <ion-select :label="translate('Primary identifier')" interface="popover" :value="getPreferredIdentification('primaryId')" @ionChange="updatePreferredIdentification($event, 'primaryId')">
+                <ion-select :label="translate('Primary identifier')" interface="popover" :placeholder="translate('Select')" :value="getPreferredIdentification('primaryId')" @ionChange="updatePreferredIdentification($event, 'primaryId')">
                   <ion-select-option v-for="option in productIdentificationOptions" :key="option" :value="option">{{ option }}</ion-select-option>
                 </ion-select>
               </ion-item>
 
               <ion-item>
-                <ion-select :label="translate('Secondary identifier')" interface="popover" :value="getPreferredIdentification('secondaryId')" @ionChange="updatePreferredIdentification($event, 'secondaryId')">
+                <ion-select :label="translate('Secondary identifier')" interface="popover" :placeholder="translate('Select')" :value="getPreferredIdentification('secondaryId')" @ionChange="updatePreferredIdentification($event, 'secondaryId')">
                   <ion-select-option v-for="option in productIdentificationOptions" :key="option" :value="option">{{ option }}</ion-select-option>
                 </ion-select>
               </ion-item>
@@ -316,7 +316,7 @@
               </ion-item>
 
               <ion-item>
-                <ion-select :label="translate('Shipment method')" interface="popover" :value="settings['RF_SHIP_MTHD']?.settingValue" @ionChange="updateProductStoreSettings($event, 'RF_SHIP_MTHD', false)" >
+                <ion-select :label="translate('Shipment method')" interface="popover" :placeholder="translate('Select')" :value="settings['RF_SHIP_MTHD']?.settingValue" @ionChange="updateProductStoreSettings($event, 'RF_SHIP_MTHD', false)" >
                   <ion-select-option v-for="shipmentMethod in shipmentMethodTypes" :key="shipmentMethod.shipmentMethodTypeId" :value="shipmentMethod.shipmentMethodTypeId">{{ shipmentMethod.description ? shipmentMethod.description : shipmentMethod.shipmentMethodTypeId }}</ion-select-option>
                 </ion-select>
               </ion-item>
@@ -347,7 +347,7 @@
 
 <script setup lang="ts">
 import { IonBackButton, IonButton, IonCard, IonCardHeader, IonCardSubtitle, IonCardTitle, IonContent, IonChip, IonHeader, IonIcon, IonInput, IonItem, IonItemDivider, IonLabel, IonList, IonPage, IonSelect, IonSelectOption, IonTitle, IonToggle, IonToolbar, alertController, onIonViewWillEnter } from "@ionic/vue";
-import { addCircleOutline, closeCircleOutline, mapOutline, thunderstormOutline, wineOutline } from "ionicons/icons";
+import { addCircleOutline, closeCircleOutline, compassOutline, mapOutline, wineOutline } from "ionicons/icons";
 import { translate } from "@/i18n";
 import { useStore } from "vuex";
 import { computed, defineProps, ref } from "vue";
@@ -437,15 +437,15 @@ async function renameProductStore() {
     {
       text: translate("Confirm"),
       handler: async(data) => {
-        if(!data.storeName) {
+        if(!data.storeName.trim()) {
           showToast(translate("Product store name can't be empty."));
           return false;
         }
 
-        if(data.storeName === productStore.value.storeName) return;
+        if(data.storeName.trim() === productStore.value.storeName) return;
 
         const updatedStore = JSON.parse(JSON.stringify(productStore.value));
-        updatedStore.storeName = data.storeName;
+        updatedStore.storeName = data.storeName.trim();
 
         try {
           const resp = await ProductStoreService.updateProductStore(updatedStore);
@@ -482,23 +482,23 @@ async function createUpdateTag(enumId: string) {
     {
       text: settingEnums[enumId]?.settingValue ? translate("Update") : translate("Add"),
       handler: async(data) => {
-        if(!data.tag) {
+        if(!data.tag.trim()) {
           showToast(translate("Tags can't be empty."));
           return false;
         }
 
-        if(data.tag === settingEnums[enumId]?.settingValue) return;
+        if(data.tag.trim() === settingEnums[enumId]?.settingValue) return;
 
         let payload;
         if(settingEnums[enumId]?.productStoreId) {
           payload = settingEnums[enumId];
-          payload.settingValue = data.tag;
+          payload.settingValue = data.tag.trim();
         } else {
           payload = {
             fromDate: DateTime.now().toMillis(),
             productStoreId: productStore.value.productStoreId,
             settingTypeEnumId: enumId,
-            settingValue: data.tag
+            settingValue: data.tag.trim()
           }
         }