diff --git a/.env.example b/.env.example
index 33bcdbe..fe4f382 100644
--- a/.env.example
+++ b/.env.example
@@ -4,5 +4,6 @@ VUE_APP_I18N_FALLBACK_LOCALE=en
 VUE_APP_LOCALES={"en": "English", "ja": "日本語", "es": "Español"}
 VUE_APP_CURRENCY_FORMATS={"en": {"currency": {"style": "currency","currency": "USD"}}, "ja": {"currency": {"style": "currency", "currency": "JPY"}}, "es": {"currency": {"style": "currency","currency": "ESP"}}}
 VUE_APP_DEFAULT_ALIAS=
-VUE_APP_MAARG_LOGIN=["atp", "company", "order-routing"]
-VUE_APP_MAARG_LOGIN_REQUIRED=["preorder"]
\ No newline at end of file
+VUE_APP_MAARG_LOGIN=["atp", "company", "order-routing", "inventorycount"]
+VUE_APP_USERS_LOGIN_URL="http://users.hotwax.io/login"
+VUE_APP_MAARG_LOGIN_REQUIRED=["preorder"]
diff --git a/package-lock.json b/package-lock.json
index c799666..4a3c3db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,13 +1,14 @@
 {
   "name": "Launchpad",
-  "version": "2.1.0",
+  "version": "3.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "Launchpad",
-      "version": "2.1.0",
+      "version": "3.0.0",
       "dependencies": {
+        "@hotwax/apps-theme": "^1.2.8",
         "@hotwax/dxp-components": "^1.12.2",
         "@hotwax/oms-api": "^1.13.0",
         "@ionic/core": "^7.6.0",
@@ -2580,6 +2581,11 @@
         "@hapi/hoek": "^9.0.0"
       }
     },
+    "node_modules/@hotwax/apps-theme": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@hotwax/apps-theme/-/apps-theme-1.2.8.tgz",
+      "integrity": "sha512-6ZE2y4DKWcDdYNToPv7L6oYM71NS4zgxfoncIUvSvA9BYqi3MavfC36Z6ujHBEB/PsUhcbU8DOdpakTvyL5aGw=="
+    },
     "node_modules/@hotwax/dxp-components": {
       "version": "1.12.2",
       "resolved": "https://registry.npmjs.org/@hotwax/dxp-components/-/dxp-components-1.12.2.tgz",
@@ -15717,6 +15723,11 @@
         "@hapi/hoek": "^9.0.0"
       }
     },
+    "@hotwax/apps-theme": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@hotwax/apps-theme/-/apps-theme-1.2.8.tgz",
+      "integrity": "sha512-6ZE2y4DKWcDdYNToPv7L6oYM71NS4zgxfoncIUvSvA9BYqi3MavfC36Z6ujHBEB/PsUhcbU8DOdpakTvyL5aGw=="
+    },
     "@hotwax/dxp-components": {
       "version": "1.12.2",
       "resolved": "https://registry.npmjs.org/@hotwax/dxp-components/-/dxp-components-1.12.2.tgz",
diff --git a/package.json b/package.json
index f90494f..1343149 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Launchpad",
-  "version": "2.1.0",
+  "version": "3.0.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -11,6 +11,7 @@
   "dependencies": {
     "@hotwax/dxp-components": "^1.12.2",
     "@hotwax/oms-api": "^1.13.0",
+    "@hotwax/apps-theme": "^1.2.8",
     "@ionic/core": "^7.6.0",
     "@ionic/vue": "^7.6.0",
     "@ionic/vue-router": "^7.6.0",
diff --git a/src/components/Image.vue b/src/components/Image.vue
new file mode 100644
index 0000000..ce0da42
--- /dev/null
+++ b/src/components/Image.vue
@@ -0,0 +1,64 @@
+<template>
+  <img :src="imageUrl"/>
+</template>
+
+<script lang="ts">
+import { defineComponent } from "vue";
+import { useAuthStore } from '@/store/auth';
+
+export default defineComponent({
+  name: "Image",
+  props: ['src'],
+  components: {},
+  mounted() {
+    this.setImageUrl();
+  },
+  updated() {
+    this.setImageUrl();
+  },
+  data() {
+    return {
+      imageUrl: require("@/assets/images/defaultImage.png")
+    }
+  },
+  methods: {
+    checkIfImageExists(src: string) {
+      return new Promise((resolve, reject) => {
+        const img = new Image();
+        img.onload = function () {
+          resolve(true);
+        }
+        img.onerror = function (error) {
+          reject(false);
+        }
+        img.src = src;
+      })
+    },
+    setImageUrl() {
+      if (this.src) {
+        if (this.src.indexOf('assets/') != -1) {
+          // Assign directly in case of assets
+          this.imageUrl = this.src;
+        } else if (this.src.startsWith('http')) {
+          // If starts with http, it is web url check for existence and assign
+          this.checkIfImageExists(this.src).then(() => {
+            this.imageUrl = this.src;
+          }).catch(() => {
+            console.error("Image doesn't exist", this.src);
+          })
+        } else {
+          const authStore = useAuthStore();
+          const baseURL = authStore.getBaseUrl.replace("/api", "")
+
+          const imageUrl = baseURL.concat(this.src)
+          this.checkIfImageExists(imageUrl).then(() => {
+            this.imageUrl = imageUrl;
+          }).catch(() => {
+            console.error("Image doesn't exist", imageUrl);
+          })
+        }
+      }
+    }
+  },
+});
+</script>
diff --git a/src/components/UserActionsPopover.vue b/src/components/UserActionsPopover.vue
new file mode 100644
index 0000000..0cfc92d
--- /dev/null
+++ b/src/components/UserActionsPopover.vue
@@ -0,0 +1,64 @@
+<template>
+  <ion-content>
+    <ion-list>
+      <ion-list-header>{{ authStore.current?.partyName ? authStore.current.partyName : authStore.current.userLoginId }}</ion-list-header>
+
+      <ion-item button @click="redirectToUserDetails()">
+        <ion-label>{{ translate("View profile") }}</ion-label>
+        <ion-icon :icon="personCircleOutline" />
+      </ion-item>
+      <ion-item button lines="none"  @click="logout()">
+        <ion-label color="danger">{{ translate("Logout") }}</ion-label>
+        <ion-icon :icon="exitOutline" color="danger"/>
+      </ion-item>
+    </ion-list>
+  </ion-content>
+</template>
+
+<script lang="ts">
+import {
+  IonContent,
+  IonIcon,
+  IonItem,
+  IonLabel,
+  IonList,
+  IonListHeader,
+  popoverController,
+} from "@ionic/vue";
+import { defineComponent } from "vue";
+import { translate } from "@/i18n";
+import { exitOutline, personCircleOutline } from 'ionicons/icons';
+import { useAuthStore } from '@/store/auth';
+
+export default defineComponent({
+  name: "UserActionsPopover",
+  components: {
+    IonContent,
+    IonIcon,
+    IonItem,
+    IonLabel,
+    IonList,
+    IonListHeader,
+  },
+  methods: {
+    redirectToUserDetails() {
+      window.location.href = `${process.env.VUE_APP_USERS_LOGIN_URL}?oms=${this.authStore.oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}&partyId=${this.authStore.current.partyId}`
+      popoverController.dismiss()
+    },
+    async logout() {
+      await this.authStore.logout()
+      popoverController.dismiss()
+    }
+  },
+  setup() {
+    const authStore = useAuthStore();
+
+    return {
+      authStore,
+      exitOutline,
+      personCircleOutline,
+      translate
+    }
+  }
+});
+</script>
\ No newline at end of file
diff --git a/src/locales/en.json b/src/locales/en.json
index b8ef5a3..851679e 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -14,5 +14,6 @@
   "Something went wrong while login. Please contact administrator.": "Something went wrong while login. Please contact administrator.",
   "Sorry, your username or password is incorrect. Please try again.": "Sorry, your username or password is incorrect. Please try again.",
   "This application is not enabled for your account": "This application is not enabled for your account",
-  "Username": "Username"
+  "Username": "Username",
+  "View profile": "View profile"
 }
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index 69e87ef..8eed0b0 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,6 +25,7 @@ import '@ionic/vue/css/display.css';
 
 /* Theme variables */
 import './theme/variables.css';
+import '@hotwax/apps-theme';
 
 const app = createApp(App)
   .use(IonicVue, {
diff --git a/src/theme/variables.css b/src/theme/variables.css
index b00dc83..05f685e 100644
--- a/src/theme/variables.css
+++ b/src/theme/variables.css
@@ -236,16 +236,6 @@ http://ionicframework.com/docs/theming/ */
 }
 
 body {
-  /** Spacer variables **/
-  --spacer-2xs: 0.25rem; /* 4px */
-  --spacer-xs: 0.5rem;   /* 8px */
-  --spacer-sm: 1rem;     /* 16px */
-  --spacer-base: 1.5rem; /* 24px */
-  --spacer-lg: 2rem;     /* 32px */
-  --spacer-xl: 2.5rem;   /* 40px */
-  --spacer-2xl: 5rem;    /* 80px */
-  --spacer-3xl: 10rem;   /* 160px */
-
   /** Border variable **/
   --border-medium: 1px solid var(--ion-color-medium);
 }
diff --git a/src/util/index.ts b/src/util/index.ts
index c29240b..b151711 100644
--- a/src/util/index.ts
+++ b/src/util/index.ts
@@ -10,14 +10,16 @@ const showToast = async (message: string) => {
   return toast.present();
 }
 
-const isMaargLogin = (handle: string) => {
+const isMaargLogin = (handle: string, environment = "") => {
+  const appHandle = environment ? handle + environment : handle
   const maargLoginApps = JSON.parse(process.env.VUE_APP_MAARG_LOGIN ? process.env.VUE_APP_MAARG_LOGIN : [])
-  return maargLoginApps.some((appName: string) => handle.includes(appName))
+  return maargLoginApps.some((appName: string) => appHandle.includes(appName))
 }
 
-const isMaargLoginRequired = (handle: string) => {
+const isMaargLoginRequired = (handle: string, environment = "") => {
+  const appHandle = environment ? handle + environment : handle
   const maargOmsRequiredApps = JSON.parse(process.env.VUE_APP_MAARG_LOGIN_REQUIRED ? process.env.VUE_APP_MAARG_LOGIN_REQUIRED : [])
-  return maargOmsRequiredApps.some((appName: string) => handle.includes(appName))
+  return maargOmsRequiredApps.some((appName: string) => appHandle.includes(appName))
 }
 
 export { isMaargLogin, isMaargLoginRequired, showToast }
\ No newline at end of file
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 4360cb1..c603af4 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -9,21 +9,21 @@
         
         <ion-card v-if="authStore.isAuthenticated">
           <ion-list>
-            <ion-item lines="full">
-              <ion-icon slot="start" :icon="lockClosedOutline"/>
-              {{ authStore.current?.partyName ? authStore.current?.partyName : authStore.current.userLoginId }}
-              <ion-button fill="outline" color="medium" slot="end" @click="authStore.logout()">
-                {{ $t('Logout') }}
-              </ion-button>
+            <ion-item lines="full" button @click="openUserActionsPopover($event)">
+              <ion-avatar slot="start">
+                <Image :src="authStore.current?.partyImageUrl" />
+              </ion-avatar>
+              <ion-label class="ion-text-nowrap">
+                <h2>{{ authStore.current?.partyName ? authStore.current?.partyName : authStore.current.userLoginId }}</h2>
+              </ion-label>
+              <ion-icon slot="end" :icon="chevronForwardOutline" class="ion-margin-start" />
             </ion-item>
-            <ion-item lines="none">
+            <ion-item lines="none" button @click="goToOms(authStore.token.value, authStore.getOMS)">
               <ion-icon slot="start" :icon="hardwareChipOutline"/>
               <ion-label>
                 <h2>{{ authStore.getOMS }}</h2>
               </ion-label>
-              <ion-button fill="clear" @click="goToOms(authStore.token.value, authStore.getOMS)">
-                <ion-icon color="medium" slot="icon-only" :icon="openOutline" />
-              </ion-button>
+              <ion-icon slot="end" :icon="openOutline" class="ion-margin-start" />
             </ion-item>
           </ion-list>
         </ion-card>
@@ -46,10 +46,12 @@
                   {{ translate("Not configured") }}
                 </ion-badge>
                 <ion-buttons class="app-links" v-else>
-                  <ion-button color="medium" @click.stop="generateAppLink(app, devHandle)">
+                  <!-- Disabled is added on the buttons only for the case when specific instance of the app support maarg login -->
+                  <!-- This checks can be removed when all the app instance uses a single login flow either from ofbiz or from moqui -->
+                  <ion-button color="medium" :disabled="authStore.isAuthenticated && isMaargLogin(app.handle, devHandle) && !authStore.getMaargOms" @click.stop="generateAppLink(app, devHandle)">
                     <ion-icon slot="icon-only" :icon="codeWorkingOutline" />
                   </ion-button>
-                  <ion-button color="medium" @click.stop="generateAppLink(app, uatHandle)">
+                  <ion-button color="medium" :disabled="authStore.isAuthenticated && isMaargLogin(app.handle, uatHandle) && !authStore.getMaargOms" @click.stop="generateAppLink(app, uatHandle)">
                     <ion-icon slot="icon-only" :icon="shieldHalfOutline" />
                   </ion-button>
                 </ion-buttons>
@@ -64,6 +66,7 @@
 
 <script lang="ts">
 import {
+  IonAvatar,
   IonBadge,
   IonButton,
   IonButtons,
@@ -75,10 +78,12 @@ import {
   IonItem,
   IonLabel,
   IonList,
-  IonPage
+  IonPage,
+  popoverController
 } from '@ionic/vue';
 import { defineComponent, ref } from 'vue';
 import {
+  chevronForwardOutline,
   codeWorkingOutline,
   hardwareChipOutline,
   lockClosedOutline,
@@ -92,10 +97,14 @@ import { useRouter } from "vue-router";
 import { goToOms } from '@hotwax/dxp-components'
 import { isMaargLogin, isMaargLoginRequired } from '@/util';
 import { translate } from '@/i18n';
+import UserActionsPopover from '@/components/UserActionsPopover.vue'
+import Image from "@/components/Image.vue";
 
 export default defineComponent({
   name: 'Home',
   components: {
+    Image,
+    IonAvatar,
     IonBadge,
     IonButton,
     IonButtons,
@@ -134,8 +143,17 @@ export default defineComponent({
       }
     },
     generateAppLink(app: any, appEnvironment = '') {
-      const oms = isMaargLogin(app.handle) ? this.authStore.getMaargOms : this.authStore.getOMS;
-      window.location.href = this.scheme + app.handle + appEnvironment + this.domain + (this.authStore.isAuthenticated ? `/login?oms=${oms.startsWith('http') ? isMaargLogin(app.handle) ? oms : oms.includes('/api') ? oms : `${oms}/api/` : oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}${isMaargLogin(app.handle) ? '&omsRedirectionUrl=' + this.authStore.getOMS : isMaargLoginRequired(app.handle) ? '&omsRedirectionUrl=' + this.authStore.getMaargOms : ''}` : '')
+      const oms = isMaargLogin(app.handle, appEnvironment) ? this.authStore.getMaargOms : this.authStore.getOMS;
+      window.location.href = this.scheme + app.handle + appEnvironment + this.domain + (this.authStore.isAuthenticated ? `/login?oms=${oms.startsWith('http') ? isMaargLogin(app.handle, appEnvironment) ? oms : oms.includes('/api') ? oms : `${oms}/api/` : oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}${isMaargLogin(app.handle, appEnvironment) ? '&omsRedirectionUrl=' + this.authStore.getOMS : isMaargLoginRequired(app.handle, appEnvironment) ? '&omsRedirectionUrl=' + this.authStore.getMaargOms : ''}` : '')
+    },
+    async openUserActionsPopover(event: any) {
+      const userActionsPopover = await popoverController.create({
+        component: UserActionsPopover,
+        event,
+        showBackdrop: false,
+      });
+
+      userActionsPopover.present();
     }
   },
   setup() {
@@ -227,6 +245,7 @@ export default defineComponent({
     return {
       authStore,
       appCategory,
+      chevronForwardOutline,
       codeWorkingOutline,
       devHandle,
       domain,
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 4405fea..871d343 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -12,9 +12,10 @@
             <div class="ion-padding">
               <!-- @keyup.enter.stop to stop the form from submitting on enter press as keyup.enter is already bound
               through the form above, causing both the form and the button to submit. -->
-              <ion-button color="primary" expand="block" @click.prevent="setOms()" @keyup.enter.stop>
+              <ion-button color="primary" expand="block" @click.prevent="isCheckingOms ? '' : setOms()" @keyup.enter.stop>
                 {{ $t("Next") }}
-                <ion-icon slot="end" :icon="arrowForwardOutline" />
+                <ion-spinner v-if="isCheckingOms" name="crescent" slot="end" />
+                <ion-icon v-else slot="end" :icon="arrowForwardOutline" />
               </ion-button>
             </div>
           </section>
@@ -34,9 +35,10 @@
             </ion-item>
 
             <div class="ion-padding">
-              <ion-button color="primary" expand="block" @click="login()">
+              <ion-button color="primary" expand="block" @click="isLoggingIn ? '' : login()">
                 {{ $t("Login") }}
-                <ion-icon slot="end" :icon="arrowForwardOutline" />
+                <ion-spinner v-if="isLoggingIn" slot="end" name="crescent" />
+                <ion-icon v-else slot="end" :icon="arrowForwardOutline" />
               </ion-button>
             </div>
           </section>
@@ -64,6 +66,7 @@ import {
   IonInput,
   IonItem,
   IonPage,
+  IonSpinner,
   loadingController
 } from "@ionic/vue";
 import { defineComponent } from "vue";
@@ -88,6 +91,7 @@ export default defineComponent({
     IonInput,
     IonItem,
     IonPage,
+    IonSpinner,
     Logo
   },
   data () {
@@ -102,7 +106,9 @@ export default defineComponent({
       hideBackground: true,
       isConfirmingForActiveSession: false,
       loader: null as any,
-      loginOption: {} as any
+      loginOption: {} as any,
+      isCheckingOms: false,
+      isLoggingIn: false
     };
   },
   ionViewWillEnter() {
@@ -208,6 +214,8 @@ export default defineComponent({
         return
       }
 
+      this.isCheckingOms = true
+
       const instanceURL = this.instanceUrl.trim().toLowerCase();
       if (!this.baseURL) this.authStore.setOMS(this.alias[instanceURL] ? this.alias[instanceURL] : instanceURL);
 
@@ -222,6 +230,7 @@ export default defineComponent({
       } else {
         this.toggleOmsInput()
       }
+      this.isCheckingOms = false
     },
     async fetchLoginOptions() {
       this.loginOption = {}
@@ -242,6 +251,7 @@ export default defineComponent({
         return
       }
 
+      this.isLoggingIn = true;
       try {
         await this.authStore.login(username.trim(), password)
         if (this.authStore.getRedirectUrl) {
@@ -255,6 +265,7 @@ export default defineComponent({
       } catch (error) {
         console.error(error)
       }
+      this.isLoggingIn = false;
     },
     async samlLogin() {
       try {
@@ -309,7 +320,7 @@ export default defineComponent({
       }
 
       omsUrl = omsUrl ? omsUrl : this.authStore.oms.startsWith('http') ? this.authStore.oms.includes('/api') ? this.authStore.oms : `${this.authStore.oms}/api/` : this.authStore.oms
-      window.location.href = `${this.authStore.getRedirectUrl}?oms=${omsUrl}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}${omsRedirectionUrl ? '&omsRedirectionUrl=' + omsRedirectionUrl : ''}`
+      window.location.replace(`${this.authStore.getRedirectUrl}?oms=${omsUrl}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}${omsRedirectionUrl ? '&omsRedirectionUrl=' + omsRedirectionUrl : ''}`)
     }
   },
   setup () {