diff --git a/package-lock.json b/package-lock.json
index 4c5453a..891bd5a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,8 +13,8 @@
         "@capacitor/ios": "^2.5.0",
         "@hotwax/app-version-info": "^1.0.0",
         "@hotwax/apps-theme": "^1.1.0",
-        "@hotwax/dxp-components": "^1.3.4",
-        "@hotwax/oms-api": "^1.6.0",
+        "@hotwax/dxp-components": "file:../dxp-components",
+        "@hotwax/oms-api": "^1.10.0",
         "@ionic/core": "6.7.5",
         "@ionic/vue": "6.7.5",
         "@ionic/vue-router": "6.7.5",
@@ -57,6 +57,39 @@
         "vue-cli-plugin-i18n": "^1.0.1"
       }
     },
+    "../dxp-components": {
+      "name": "@hotwax/dxp-components",
+      "version": "1.7.5",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@hotwax/oms-api": "^1.8.1",
+        "@ionic/core": "^6.7.5",
+        "@ionic/vue": "^6.7.5",
+        "@types/vue-barcode-reader": "^0.0.0",
+        "firebase": "^10.3.1",
+        "luxon": "^3.3.0",
+        "pinia": "2.0.36",
+        "pinia-plugin-persistedstate": "^3.1.0",
+        "vue": "^3.3.4",
+        "vue-barcode-reader": "^1.0.3",
+        "vue-i18n": "^9.2.2"
+      },
+      "devDependencies": {
+        "@babel/types": "^7.22.11",
+        "@types/luxon": "^3.3.0",
+        "@types/node": "^20.5.7",
+        "@vitejs/plugin-vue": "^4.3.4",
+        "@vue/eslint-config-prettier": "^8.0.0",
+        "@vue/eslint-config-typescript": "^11.0.3",
+        "@vue/tsconfig": "^0.1.3",
+        "eslint": "^8.48.0",
+        "eslint-plugin-vue": "^9.17.0",
+        "rollup-plugin-typescript2": "^0.35.0",
+        "typescript": "~4.7.4",
+        "vite": "^4.4.9",
+        "vue-tsc": "^1.8.8"
+      }
+    },
     "node_modules/@achrinza/node-ipc": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.2.tgz",
@@ -2185,21 +2218,13 @@
       "integrity": "sha512-yokhlpG+eUEao19vaUtCOC5YwcYTb5sf5joGVH17mbb5B1hM4G+P4ZiGiFw2AMmZBKgu94DtHwSyjtdsf4bHug=="
     },
     "node_modules/@hotwax/dxp-components": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@hotwax/dxp-components/-/dxp-components-1.3.4.tgz",
-      "integrity": "sha512-uw0dmxm19lzsgcLWZ2fQBAZem0d7TkxGR0iSq1c7Bj1mkAJZXH5JbP12w0lYhtes7Q1MjhHPlWljCh6624E9XA==",
-      "dependencies": {
-        "@hotwax/oms-api": "^1.8.1",
-        "luxon": "^3.3.0",
-        "pinia": "2.0.36",
-        "pinia-plugin-persistedstate": "^3.1.0",
-        "vue": "^3.3.4"
-      }
+      "resolved": "../dxp-components",
+      "link": true
     },
     "node_modules/@hotwax/oms-api": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@hotwax/oms-api/-/oms-api-1.8.1.tgz",
-      "integrity": "sha512-pVceiuaOSkRZM3i87+TCEu6uBMDG01JGTG92mCpDUXWmA6nd0BL7QiK1Qr8a9lDTib0M24RVBDCGc/cX6nlxgg==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@hotwax/oms-api/-/oms-api-1.10.0.tgz",
+      "integrity": "sha512-Li9vqTsGHqfTalL2FWDAIPSEdiZyRLDQOcHzXf5YFo8yTLEgiBM1kvfl12nXYWRpVtE9DPDMHkqxkWRlQTM/Lw==",
       "dependencies": {
         "@types/node-json-transform": "^1.0.0",
         "axios": "^0.21.1",
@@ -25426,64 +25451,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/pinia": {
-      "version": "2.0.36",
-      "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.36.tgz",
-      "integrity": "sha512-4UKApwjlmJH+VuHKgA+zQMddcCb3ezYnyewQ9NVrsDqZ/j9dMv5+rh+1r48whKNdpFkZAWVxhBp5ewYaYX9JcQ==",
-      "dependencies": {
-        "@vue/devtools-api": "^6.5.0",
-        "vue-demi": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/posva"
-      },
-      "peerDependencies": {
-        "@vue/composition-api": "^1.4.0",
-        "typescript": ">=4.4.4",
-        "vue": "^2.6.14 || ^3.2.0"
-      },
-      "peerDependenciesMeta": {
-        "@vue/composition-api": {
-          "optional": true
-        },
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/pinia-plugin-persistedstate": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/pinia-plugin-persistedstate/-/pinia-plugin-persistedstate-3.2.0.tgz",
-      "integrity": "sha512-tZbNGf2vjAQcIm7alK40sE51Qu/m9oWr+rEgNm/2AWr1huFxj72CjvpQcIQzMknDBJEkQznCLAGtJTIcLKrKdw==",
-      "peerDependencies": {
-        "pinia": "^2.0.0"
-      }
-    },
-    "node_modules/pinia/node_modules/vue-demi": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.5.tgz",
-      "integrity": "sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==",
-      "hasInstallScript": true,
-      "bin": {
-        "vue-demi-fix": "bin/vue-demi-fix.js",
-        "vue-demi-switch": "bin/vue-demi-switch.js"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      },
-      "peerDependencies": {
-        "@vue/composition-api": "^1.0.0-rc.1",
-        "vue": "^3.0.0-0 || ^2.6.0"
-      },
-      "peerDependenciesMeta": {
-        "@vue/composition-api": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
@@ -29941,7 +29908,7 @@
       "version": "4.7.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
       "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
-      "devOptional": true,
+      "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -34832,21 +34799,38 @@
       "integrity": "sha512-yokhlpG+eUEao19vaUtCOC5YwcYTb5sf5joGVH17mbb5B1hM4G+P4ZiGiFw2AMmZBKgu94DtHwSyjtdsf4bHug=="
     },
     "@hotwax/dxp-components": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@hotwax/dxp-components/-/dxp-components-1.3.4.tgz",
-      "integrity": "sha512-uw0dmxm19lzsgcLWZ2fQBAZem0d7TkxGR0iSq1c7Bj1mkAJZXH5JbP12w0lYhtes7Q1MjhHPlWljCh6624E9XA==",
+      "version": "file:../dxp-components",
       "requires": {
+        "@babel/types": "^7.22.11",
         "@hotwax/oms-api": "^1.8.1",
+        "@ionic/core": "^6.7.5",
+        "@ionic/vue": "^6.7.5",
+        "@types/luxon": "^3.3.0",
+        "@types/node": "^20.5.7",
+        "@types/vue-barcode-reader": "^0.0.0",
+        "@vitejs/plugin-vue": "^4.3.4",
+        "@vue/eslint-config-prettier": "^8.0.0",
+        "@vue/eslint-config-typescript": "^11.0.3",
+        "@vue/tsconfig": "^0.1.3",
+        "eslint": "^8.48.0",
+        "eslint-plugin-vue": "^9.17.0",
+        "firebase": "^10.3.1",
         "luxon": "^3.3.0",
         "pinia": "2.0.36",
         "pinia-plugin-persistedstate": "^3.1.0",
-        "vue": "^3.3.4"
+        "rollup-plugin-typescript2": "^0.35.0",
+        "typescript": "~4.7.4",
+        "vite": "^4.4.9",
+        "vue": "^3.3.4",
+        "vue-barcode-reader": "^1.0.3",
+        "vue-i18n": "^9.2.2",
+        "vue-tsc": "^1.8.8"
       }
     },
     "@hotwax/oms-api": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@hotwax/oms-api/-/oms-api-1.8.1.tgz",
-      "integrity": "sha512-pVceiuaOSkRZM3i87+TCEu6uBMDG01JGTG92mCpDUXWmA6nd0BL7QiK1Qr8a9lDTib0M24RVBDCGc/cX6nlxgg==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@hotwax/oms-api/-/oms-api-1.10.0.tgz",
+      "integrity": "sha512-Li9vqTsGHqfTalL2FWDAIPSEdiZyRLDQOcHzXf5YFo8yTLEgiBM1kvfl12nXYWRpVtE9DPDMHkqxkWRlQTM/Lw==",
       "requires": {
         "@types/node-json-transform": "^1.0.0",
         "axios": "^0.21.1",
@@ -53200,29 +53184,6 @@
       "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
       "dev": true
     },
-    "pinia": {
-      "version": "2.0.36",
-      "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.36.tgz",
-      "integrity": "sha512-4UKApwjlmJH+VuHKgA+zQMddcCb3ezYnyewQ9NVrsDqZ/j9dMv5+rh+1r48whKNdpFkZAWVxhBp5ewYaYX9JcQ==",
-      "requires": {
-        "@vue/devtools-api": "^6.5.0",
-        "vue-demi": "*"
-      },
-      "dependencies": {
-        "vue-demi": {
-          "version": "0.14.5",
-          "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.5.tgz",
-          "integrity": "sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==",
-          "requires": {}
-        }
-      }
-    },
-    "pinia-plugin-persistedstate": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/pinia-plugin-persistedstate/-/pinia-plugin-persistedstate-3.2.0.tgz",
-      "integrity": "sha512-tZbNGf2vjAQcIm7alK40sE51Qu/m9oWr+rEgNm/2AWr1huFxj72CjvpQcIQzMknDBJEkQznCLAGtJTIcLKrKdw==",
-      "requires": {}
-    },
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
@@ -56825,7 +56786,7 @@
       "version": "4.7.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
       "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
-      "devOptional": true
+      "dev": true
     },
     "uglify-js": {
       "version": "3.4.10",
diff --git a/package.json b/package.json
index b9af37c..d4ee107 100644
--- a/package.json
+++ b/package.json
@@ -17,8 +17,8 @@
     "@capacitor/ios": "^2.5.0",
     "@hotwax/app-version-info": "^1.0.0",
     "@hotwax/apps-theme": "^1.1.0",
-    "@hotwax/dxp-components": "^1.3.4",
-    "@hotwax/oms-api": "^1.6.0",
+    "@hotwax/dxp-components": "file:../dxp-components",
+    "@hotwax/oms-api": "^1.10.0",
     "@ionic/core": "6.7.5",
     "@ionic/vue": "6.7.5",
     "@ionic/vue-router": "6.7.5",
diff --git a/src/adapter/index.ts b/src/adapter/index.ts
index 0d51237..99fa835 100644
--- a/src/adapter/index.ts
+++ b/src/adapter/index.ts
@@ -1,8 +1,9 @@
-import { api, client, initialise, resetConfig, updateInstanceUrl, updateToken } from '@hotwax/oms-api'
+import { api, client, getConfig, initialise, resetConfig, updateInstanceUrl, updateToken } from '@hotwax/oms-api'
 
 export {
   api,
   client,
+  getConfig,
   initialise,
   resetConfig,
   updateInstanceUrl,
diff --git a/src/main.ts b/src/main.ts
index dc87529..1804457 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -30,6 +30,7 @@ import i18n from './i18n'
 import store from './store'
 import { dxpComponents } from '@hotwax/dxp-components'
 import { login, logout, loader } from './user-utils';
+import { getConfig, initialise } from './adapter';
 
 const app = createApp(App)
   .use(IonicVue, {
@@ -43,7 +44,9 @@ const app = createApp(App)
     login,
     logout,
     loader,
-    appLoginUrl: process.env.VUE_APP_LOGIN_URL as string
+    appLoginUrl: process.env.VUE_APP_LOGIN_URL as string,
+    getConfig,
+    initialise
   });
 
 // Filters are removed in Vue 3 and global filter introduced https://v3.vuejs.org/guide/migration/filters.html#global-filters
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 090c956..8d30484 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -6,29 +6,8 @@
       </ion-toolbar>
     </ion-header>
     <ion-content>
-      <div class="user-profile">
-        <ion-card>
-          <ion-item lines="full">
-            <ion-avatar slot="start" v-if="userProfile?.partyImageUrl">
-              <Image :src="userProfile.partyImageUrl"/>
-            </ion-avatar>
-            <!-- ion-no-padding to remove extra side/horizontal padding as additional padding 
-            is added on sides from ion-item and ion-padding-vertical to compensate the removed
-            vertical padding -->
-            <ion-card-header class="ion-no-padding ion-padding-vertical">
-              <ion-card-subtitle>{{ userProfile?.userLoginId }}</ion-card-subtitle>
-              <ion-card-title>{{ userProfile?.partyName }}</ion-card-title>
-            </ion-card-header>
-          </ion-item>
-          <ion-button color="danger" @click="logout()">{{ $t("Logout") }}</ion-button>
-          <ion-button fill="outline" @click="goToLaunchpad()">
-            {{ $t("Go to Launchpad") }}
-            <ion-icon slot="end" :icon="openOutline" />
-          </ion-button>
-          <!-- Commenting this code as we currently do not have reset password functionality -->
-          <!-- <ion-button fill="outline" color="medium">{{ $t("Reset password") }}</ion-button> -->
-        </ion-card>
-      </div>
+      <DxpUserProfile @reset-state-before-logout="resetStateBeforeLogout" :userProfile="userProfile" logoutLabel="Logout" goToLabel="Go to Launchpad" />
+
       <div class="section-header">
         <h1>{{ $t('OMS') }}</h1>
       </div>
@@ -112,19 +91,17 @@
 </template>
 
 <script lang="ts">
-import { IonAvatar, IonButton, IonCard, IonCardContent, IonCardHeader, IonCardSubtitle, IonCardTitle, IonContent, IonHeader, IonIcon, IonItem, IonLabel, IonPage, IonSelect, IonSelectOption, IonTitle, IonToolbar, modalController } from '@ionic/vue';
+import { IonButton, IonCard, IonCardContent, IonCardHeader, IonCardSubtitle, IonCardTitle, IonContent, IonHeader, IonIcon, IonItem, IonLabel, IonPage, IonSelect, IonSelectOption, IonTitle, IonToolbar, modalController } from '@ionic/vue';
 import { defineComponent } from 'vue';
 import { businessOutline, personCircleOutline, codeWorkingOutline, openOutline, timeOutline } from 'ionicons/icons'; 
 import { mapGetters, useStore } from 'vuex';
 import { useRouter } from 'vue-router';
-import Image from '@/components/Image.vue';
 import { DateTime } from 'luxon';
 import TimeZoneModal from '@/views/TimezoneModal.vue';
 
 export default defineComponent({
   name: 'Settings',
   components: {
-    IonAvatar,
     IonButton, 
     IonCard,
     IonCardContent,
@@ -140,8 +117,7 @@ export default defineComponent({
     IonSelect,
     IonSelectOption,
     IonTitle, 
-    IonToolbar,
-    Image
+    IonToolbar
   },
   data() {
     return {
@@ -183,12 +159,8 @@ export default defineComponent({
       });
       return timeZoneModal.present();
     },
-    logout () {
-      this.store.dispatch('user/logout').then(() => {
-        this.store.dispatch('picklist/clearPicklist')
-        const redirectUrl = window.location.origin + '/login'
-        window.location.href = `${process.env.VUE_APP_LOGIN_URL}?isLoggedOut=true&redirectUrl=${redirectUrl}`
-      })
+    async resetStateBeforeLogout() {
+      await   this.store.dispatch('picklist/clearPicklist')
     },
     setFacility (facility: any) {
       if (this.userProfile){
@@ -202,9 +174,6 @@ export default defineComponent({
     goToOms(){
       window.open(this.instanceUrl.startsWith('http') ? this.instanceUrl.replace('api/', "") : `https://${this.instanceUrl}.hotwax.io/`, '_blank', 'noopener, noreferrer');
     },
-    goToLaunchpad() {
-      window.location.href = `${process.env.VUE_APP_LOGIN_URL}`
-    },
     getDateTime(time: any) {
       return DateTime.fromMillis(time).toLocaleString(DateTime.DATETIME_MED);
     },
@@ -238,10 +207,6 @@ export default defineComponent({
     grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
     align-items: start;
   }
-  .user-profile {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(400px, 1fr));
-  }
   .section-header {
     display: flex;
     justify-content: space-between;
diff --git a/vue.config.js b/vue.config.js
index 67e220e..79998ac 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,3 +1,4 @@
+const path = require('path')
 require("@hotwax/app-version-info")
 module.exports = {
   // WHY THIS CONFIG: Error while using pinia while importing dxp-components - 
@@ -5,6 +6,11 @@ module.exports = {
   // WHY ERROR: Using Vue CLI 4.x may cause this error (according to Pinia docs, did their suggested resolution)
   // REFERENCE: https://pinia.vuejs.org/cookbook/migration-v1-v2.html#webpack-4-support
   configureWebpack: {
+    resolve: {
+      alias: {
+        vue: path.resolve('./node_modules/vue')
+      }
+    },
     module: {
       rules: [
         {
@@ -27,5 +33,6 @@ module.exports = {
       enableInSFC: true
     }
   },
-  runtimeCompiler: true
+  runtimeCompiler: true,
+  transpileDependencies: ['@hotwax/dxp-components']
 }