diff --git a/launcher/public/animation/setup/heartcore.gif b/launcher/public/animation/setup/heartcore.gif
new file mode 100644
index 000000000..36f3c83a2
Binary files /dev/null and b/launcher/public/animation/setup/heartcore.gif differ
diff --git a/launcher/public/output.css b/launcher/public/output.css
index dd9b9df6b..ea80a8c68 100755
--- a/launcher/public/output.css
+++ b/launcher/public/output.css
@@ -1,7 +1,7 @@
 @import url("https://fonts.googleapis.com/css2?family=Noto+Sans:wght@100;200;300;400;500;600;700;800;900&display=swap");
 
 /*
-! tailwindcss v3.4.4 | MIT License | https://tailwindcss.com
+! tailwindcss v3.4.6 | MIT License | https://tailwindcss.com
 */
 
 /*
@@ -807,10 +807,6 @@ video {
   top: -90px;
 }
 
-.bottom-0{
-  bottom: 0px;
-}
-
 .bottom-0\.5{
   bottom: 0.125rem;
 }
@@ -2382,11 +2378,6 @@ video {
           flex: none;
 }
 
-.flex-shrink{
-  -ms-flex-negative: 1;
-      flex-shrink: 1;
-}
-
 .flex-shrink-0{
   -ms-flex-negative: 0;
       flex-shrink: 0;
@@ -2708,11 +2699,6 @@ video {
           flex-direction: column;
 }
 
-.flex-wrap{
-  -ms-flex-wrap: wrap;
-      flex-wrap: wrap;
-}
-
 .place-content-center{
   place-content: center;
 }
@@ -5344,11 +5330,6 @@ html body {
   left: 2px;
 }
 
-.after\:top-0::after{
-  content: var(--tw-content);
-  top: 0px;
-}
-
 .after\:top-0\.5::after{
   content: var(--tw-content);
   top: 0.125rem;
diff --git a/launcher/src/components/UI/base-header/components/tabs/SingleTab.vue b/launcher/src/components/UI/base-header/components/tabs/SingleTab.vue
index 29b795f2e..94e085a7b 100644
--- a/launcher/src/components/UI/base-header/components/tabs/SingleTab.vue
+++ b/launcher/src/components/UI/base-header/components/tabs/SingleTab.vue
@@ -2,15 +2,20 @@
   <router-link
     :to="props.tab.path"
     class="w-full h-8 col-span-2 transition-colors duration-300 min-w-[100px] transform text-gray-200 rounded-full px-4 py-1 text-center font-semibold shadow-sm shadow-[#1c3634] border border-[#4b8585]"
-    :class="isActiveTab ? 'bg-[#224141] hover:bg-[#224141]  border-gray-600' : 'bg-[#387272] hover:bg-[#336666]'"
+    :class="[
+      isActiveTab ? 'bg-[#224141] hover:bg-[#224141]  border-gray-600' : 'bg-[#387272] hover:bg-[#336666]',
+      pagesTabsHandler ? 'pointer-events-none opacity-45' : 'cursor-pointer',
+    ]"
     >{{ props.tab.page }}</router-link
   >
 </template>
 <script setup>
 import { useRouter } from "vue-router";
-// import i18n from "@/includes/i18n";
+
 import { computed } from "vue";
 
+import { useServices } from "@/store/services";
+
 const props = defineProps({
   tab: {
     type: Object,
@@ -18,8 +23,12 @@ const props = defineProps({
   },
 });
 
+const serviceStore = useServices();
 const router = useRouter();
-// const t = i18n.global.t;
+
+const pagesTabsHandler = computed(() => {
+  return serviceStore.installedServices.length === 0;
+});
 
 const isActiveTab = computed(() => {
   return (
diff --git a/launcher/src/components/UI/server-management/components/ServerHeader.vue b/launcher/src/components/UI/server-management/components/ServerHeader.vue
index e4ea8f41d..cacd9b548 100644
--- a/launcher/src/components/UI/server-management/components/ServerHeader.vue
+++ b/launcher/src/components/UI/server-management/components/ServerHeader.vue
@@ -12,16 +12,17 @@ import { ref, watchEffect } from 'vue';
           :class="[
             'col-span-1 w-8 h-8 bg-gray-500 hover:text-teal-500 border border-gray-500 hover:border-teal-200 rounded-sm shadow-md shadow-black flex justify-center items-center cursor-pointer active:scale-95 transition-all duration-200 active:shadow-none',
             tab.isActive ? 'bg-teal-500 border-teal-200' : '',
-            isLoginRoute &&
-            (tab.name === 'info' ||
-              tab.name === 'ssh' ||
-              tab.name === 'update' ||
-              tab.name === 'settings' ||
-              tab.name === '2fa')
-              ? ' opacity-30 pointer-events-none scale-90 shadow-none'
-              : '',
+            isConnectedServer && tab.name === 'login' ? ' opacity-30 pointer-events-none scale-90 shadow-none' : '',
+            isServerToConnect && tab.name !== 'login' ? ' opacity-30 pointer-events-none scale-90 shadow-none' : '',
+            isLoginRoute && tab.name !== 'login' ? ' opacity-30 pointer-events-none scale-90 shadow-none' : '',
           ]"
-          @click="isLoginRoute && (tab.name === 'info' || tab.name === 'ssh') ? null : tabPicker(tab.name)"
+          @click="
+            (isServerToConnect && tab.name !== 'login') ||
+            (isConnectedServer && tab.name === 'login') ||
+            (isLoginRoute && tab.name !== 'login')
+              ? null
+              : tabPicker(tab.name)
+          "
           @mouseenter="footerStore.cursorLocation = `${tabTooltip(tab)}`"
           @mouseleave="footerStore.cursorLocation = ''"
         >
@@ -74,6 +75,14 @@ const tabTooltip = (tab) => {
   return null; // Default case if none of the conditions match
 };
 
+const isConnectedServer = computed(() => {
+  return serverStore.selectedServerConnection && !serverStore.selectedServerToConnect;
+});
+
+const isServerToConnect = computed(() => {
+  return serverStore.selectedServerToConnect;
+});
+
 const tabPicker = (tabName) => {
   serverStore.setActiveTab(tabName);
   emit("tabPicker", tabName);
diff --git a/launcher/src/components/UI/server-management/components/saved-servers/ServerRow.vue b/launcher/src/components/UI/server-management/components/saved-servers/ServerRow.vue
index 6acbb7ea1..b7517b338 100644
--- a/launcher/src/components/UI/server-management/components/saved-servers/ServerRow.vue
+++ b/launcher/src/components/UI/server-management/components/saved-servers/ServerRow.vue
@@ -110,13 +110,11 @@ const serverAvatar = computed(() => {
 });
 
 const connectedServer = computed(() => {
-  if (serverStore.selectedServerConnection?.name === props.server.name) return true;
-  else return false;
+  return serverStore.selectedServerConnection?.name === props.server.name;
 });
 
 const sshExists = computed(() => {
-  if (props.server.keylocation !== "") return true;
-  else return false;
+  return props.server.keylocation !== "";
 });
 
 watchEffect(() => {
diff --git a/launcher/src/components/UI/staking-page/StakingScreen.vue b/launcher/src/components/UI/staking-page/StakingScreen.vue
index ba6d8bfc1..019f5639b 100644
--- a/launcher/src/components/UI/staking-page/StakingScreen.vue
+++ b/launcher/src/components/UI/staking-page/StakingScreen.vue
@@ -1,6 +1,8 @@
 <template>
   <base-layout>
-    <div class="w-full h-full max-h-[492px] grid grid-cols-24 grid-rows-12 pt-1 select-none">
+    <div
+      class="w-full h-full max-h-[492px] grid grid-cols-24 grid-rows-12 pt-1 select-none"
+    >
       <SidebarSection />
 
       <ListSection
@@ -35,31 +37,35 @@
       enter-active-class="animate__animated animate__fadeIn"
       leave-active-class="animate__animated animate__fadeOut"
     >
-      <component :is="activeModal?.component" v-bind="activeModal?.props" v-on="activeModal?.events" />
+      <component
+        :is="activeModal?.component"
+        v-bind="activeModal?.props"
+        v-on="activeModal?.events"
+      />
     </transition>
   </base-layout>
 </template>
 
 <script setup>
-import SidebarSection from "./sections/SidebarSection.vue";
-import ListSection from "./sections/ListSection";
-import ManagementSection from "./sections/ManagementSection.vue";
+import { useListGroups } from "@/composables/groups";
+import { useMultiSetups } from "@/composables/multiSetups";
+import { useDeepClone } from "@/composables/utils";
+import { useListKeys } from "@/composables/validators";
+import { useServices } from "@/store/services";
+import { useSetups } from "@/store/setups";
+import { useStakingStore } from "@/store/theStaking";
+import { saveAs } from "file-saver";
+import { computed, onUnmounted, watch, watchEffect } from "vue";
 import ControlService from "../../../store/ControlService";
+import ImportRemote from "./components/modals/ImportRemote.vue";
 import ImportValidator from "./components/modals/ImportValidator.vue";
-import RiskWarning from "./components/modals/RiskWarning.vue";
 import RemoveGroup from "./components/modals/RemoveGroup.vue";
-import ImportRemote from "./components/modals/ImportRemote.vue";
-import WithdrawMultiple from "./components/modals/WithdrawMultiple.vue";
-import { useListKeys } from "@/composables/validators";
-import { useStakingStore } from "@/store/theStaking";
-import { computed, watch, onUnmounted } from "vue";
-import { useServices } from "@/store/services";
-import { useListGroups } from "@/composables/groups";
 import RemoveValidators from "./components/modals/RemoveValidators.vue";
-import { useDeepClone } from "@/composables/utils";
-import { saveAs } from "file-saver";
-import { useSetups } from "@/store/setups";
-import { useMultiSetups } from "@/composables/multiSetups";
+import RiskWarning from "./components/modals/RiskWarning.vue";
+import WithdrawMultiple from "./components/modals/WithdrawMultiple.vue";
+import ListSection from "./sections/ListSection";
+import ManagementSection from "./sections/ManagementSection.vue";
+import SidebarSection from "./sections/SidebarSection.vue";
 
 //Store
 const stakingStore = useStakingStore();
@@ -128,12 +134,6 @@ watch(
   }
 );
 
-//Lifecycle Hooks
-onUnmounted(() => {
-  setupStore.selectedSetup = null;
-  getServerView();
-});
-
 // *************** Methods *****************
 
 //**** List Keys ****
@@ -190,24 +190,37 @@ const uploadValidatorKey = (event) => {
   let uploadedFiles = event.target.files;
   stakingStore.previewKeys = [];
   handleFiles(uploadedFiles);
-  stakingStore.passwordFiles = [...uploadedFiles].filter((file) => file.type === "text/plain");
-  stakingStore.keyFiles = [...uploadedFiles].filter((file) => file.type === "application/json");
+  stakingStore.passwordFiles = [...uploadedFiles].filter(
+    (file) => file.type === "text/plain"
+  );
+  stakingStore.keyFiles = [...uploadedFiles].filter(
+    (file) => file.type === "application/json"
+  );
   stakingStore.isOverDropZone = false;
   stakingStore.isPreviewListActive = true;
   stakingStore.setActivePanel("validator");
 };
 
 const onDrop = (event) => {
-  let validator = serviceStore.installedServices.filter((s) => s.category === "validator");
+  let validator = serviceStore.installedServices.filter(
+    (s) => s.category === "validator"
+  );
   if (validator && validator.map((e) => e.state).includes("running")) {
     stakingStore.previewKeys = [];
     let droppedFiles = event.dataTransfer.files;
-    if (droppedFiles[0]["type"] === "application/json" || droppedFiles[0]["type"] === "text/plain") {
+    if (
+      droppedFiles[0]["type"] === "application/json" ||
+      droppedFiles[0]["type"] === "text/plain"
+    ) {
       stakingStore.isOverDropZone = false;
       stakingStore.isPreviewListActive = true;
       handleFiles(droppedFiles);
-      stakingStore.passwordFiles = [...droppedFiles].filter((file) => file.type === "text/plain");
-      stakingStore.keyFiles = [...droppedFiles].filter((file) => file.type === "application/json");
+      stakingStore.passwordFiles = [...droppedFiles].filter(
+        (file) => file.type === "text/plain"
+      );
+      stakingStore.keyFiles = [...droppedFiles].filter(
+        (file) => file.type === "application/json"
+      );
       stakingStore.setActivePanel("validator");
     } else {
       stakingStore.inputWrongKey = true;
@@ -235,7 +248,10 @@ const importKey = async (val) => {
 
   stakingStore.importEnteredPassword = "";
   stakingStore.forceRefresh = true;
-  if (stakingStore.isDoppelgangerProtectionActive && stakingStore.doppelgangerKeys.length > 0) {
+  if (
+    stakingStore.isDoppelgangerProtectionActive &&
+    stakingStore.doppelgangerKeys.length > 0
+  ) {
     setTimeout(() => {
       stakingStore.setActiveModal(null);
     }, 10000);
@@ -252,7 +268,9 @@ const riskAccepted = async () => {
       useDeepClone({
         serviceID: stakingStore.selectedServiceToFilter.config?.serviceID,
         url: stakingStore.previewRemoteKeys[0]?.url, //url is for all keys the same
-        pubkeys: stakingStore.previewRemoteKeys.filter((k) => k.selected).map((k) => k.pubkey),
+        pubkeys: stakingStore.previewRemoteKeys
+          .filter((k) => k.selected)
+          .map((k) => k.pubkey),
       })
     );
   } else {
@@ -269,13 +287,15 @@ const confirmPassword = async (pass) => {
 };
 
 const importValidatorProcessing = async () => {
-  stakingStore.checkActiveValidatorsResponse = await ControlService.checkActiveValidators({
-    files: stakingStore.keyFiles,
-    passwordFiles: stakingStore.passwordFiles,
-    password: stakingStore.importEnteredPassword,
-    serviceID: stakingStore.selectedValidatorService.config?.serviceID,
-    slashingDB: stakingStore.slashingDB?.path || null,
-  });
+  stakingStore.checkActiveValidatorsResponse = await ControlService.checkActiveValidators(
+    {
+      files: stakingStore.keyFiles,
+      passwordFiles: stakingStore.passwordFiles,
+      password: stakingStore.importEnteredPassword,
+      serviceID: stakingStore.selectedValidatorService.config?.serviceID,
+      slashingDB: stakingStore.slashingDB?.path || null,
+    }
+  );
 
   if (
     stakingStore.checkActiveValidatorsResponse.length === 0 ||
@@ -435,7 +455,9 @@ const removeGroupConfirm = async (item) => {
   // stakingStore.currentGroup.keys.forEach((key) => {
   //   stakingStore.keys.push(key);
   // });
-  stakingStore.validatorKeyGroups = stakingStore.validatorKeyGroups.filter((group) => group?.id !== item.id);
+  stakingStore.validatorKeyGroups = stakingStore.validatorKeyGroups.filter(
+    (group) => group?.id !== item.id
+  );
   stakingStore.setActiveModal(null);
   stakingStore.setMode("create");
   stakingStore.currentGroup = "";
@@ -450,7 +472,9 @@ const removeGroupConfirm = async (item) => {
 
 //Confirm Rename Validator Key
 const confirmValidatorKeyRename = async (name) => {
-  stakingStore.keys.find((key) => key.key === stakingStore.selectKeyToRename.key).selected = false;
+  stakingStore.keys.find(
+    (key) => key.key === stakingStore.selectKeyToRename.key
+  ).selected = false;
   let el = stakingStore.selectKeyToRename;
 
   el.displayName = name;
@@ -476,7 +500,9 @@ const resetValidatorKeyName = async (el) => {
     console.log("Couldn't Reset Key Name!");
   }
 
-  stakingStore.keys.find((key) => key.key === stakingStore.selectKeyToRename.key).selected = false;
+  stakingStore.keys.find(
+    (key) => key.key === stakingStore.selectKeyToRename.key
+  ).selected = false;
 };
 
 //****End of Validator Key ****
@@ -486,8 +512,12 @@ const doppelgangerController = async (item) => {
   try {
     const res = await ControlService.getServiceYAML(item?.config.serviceID);
     item.expertOptions.map((option) => {
-      if (item.service === "LighthouseValidatorService" && option.title === "Doppelganger") {
-        stakingStore.doppelgangerStatus = res.indexOf(option.pattern[0]) === -1 ? false : true;
+      if (
+        item.service === "LighthouseValidatorService" &&
+        option.title === "Doppelganger"
+      ) {
+        stakingStore.doppelgangerStatus =
+          res.indexOf(option.pattern[0]) === -1 ? false : true;
       } else if (option.title === "Doppelganger") {
         const matchedValue = res.match(new RegExp(option.pattern[0]))
           ? [...res.match(new RegExp(option.pattern[0]))][2]
@@ -523,8 +553,12 @@ const pickValidatorService = async (service) => {
 //Delete Preview Key
 
 const deletePreviewKey = async (item) => {
-  stakingStore.previewKeys = stakingStore.previewKeys.filter((key) => key.filename !== item.filename);
-  stakingStore.doppelgangerKeys = stakingStore.doppelgangerKeys.filter((key) => key.filename !== item.filename);
+  stakingStore.previewKeys = stakingStore.previewKeys.filter(
+    (key) => key.filename !== item.filename
+  );
+  stakingStore.doppelgangerKeys = stakingStore.doppelgangerKeys.filter(
+    (key) => key.filename !== item.filename
+  );
 
   const indexItem = stakingStore.keyFiles.findIndex((key) => key.name === item.filename);
   if (indexItem !== -1) {
@@ -610,7 +644,10 @@ const withdrawValidatorKey = async () => {
       // If multiple keys
       const multiKeys = stakingStore.keys
 
-        .filter((item) => item.validatorID === stakingStore.selectedServiceToFilter.config?.serviceID)
+        .filter(
+          (item) =>
+            item.validatorID === stakingStore.selectedServiceToFilter.config?.serviceID
+        )
         .map((item) => item.key);
 
       res = await Promise.all(
@@ -697,7 +734,10 @@ const exportExitMessage = async () => {
       saveExitMessage(result, "single");
     } else {
       const pubkeys = stakingStore.keys
-        .filter((item) => item.validatorID === stakingStore.selectedServiceToFilter?.config?.serviceID)
+        .filter(
+          (item) =>
+            item.validatorID === stakingStore.selectedServiceToFilter?.config?.serviceID
+        )
         .map((item) => item.key);
 
       const results = await Promise.all(
@@ -722,7 +762,8 @@ const saveExitMessage = (data, type) => {
       ? JSON.stringify(data, null, 2)
       : data.map((entry) => JSON.stringify(entry, null, 2)).join("\n\n");
 
-  const fileName = type === "single" ? "single_exit_message.txt" : "multiple_exit_messages.txt";
+  const fileName =
+    type === "single" ? "single_exit_message.txt" : "multiple_exit_messages.txt";
   const blob = new Blob([content], { type: "application/json;charset=utf-8" });
   saveAs(blob, fileName);
 };
@@ -753,7 +794,11 @@ const removeValidatorKeys = async () => {
     if (changed === 1 && id) {
       // Remove all Local Keys if selected validator holds some
       if (localKeys && localKeys.length > 0) {
-        const returnVal = await deleteValidators(id, localKeys, stakingStore.pickedSlashing);
+        const returnVal = await deleteValidators(
+          id,
+          localKeys,
+          stakingStore.pickedSlashing
+        );
 
         if (stakingStore.pickedSlashing === "yes") {
           downloadFile(returnVal);
@@ -792,6 +837,25 @@ const downloadFile = (data) => {
   window.URL.revokeObjectURL(url);
 };
 
+// ******  Key Color *******
+const getKeySetupColor = () => {
+  try {
+    stakingStore.keys = stakingStore?.keys.map((key) => {
+      const allSetups = useDeepClone(setupStore.allSetups);
+      const setup = allSetups.find((s) =>
+        s?.services.some((service) => service.id === key.validatorID)
+      );
+      const setupColor = setup ? setup.color : "default";
+      return {
+        ...key,
+        color: setupColor,
+      };
+    });
+  } catch (error) {
+    console.error("Error fetching setup color:", error);
+  }
+};
+
 // ******  Remote Key *******
 
 const importRemoteKey = async (args) => {
@@ -812,11 +876,15 @@ const importRemoteKey = async (args) => {
 
 const confirmImportRemoteKeys = async () => {
   stakingStore.setActiveModal("remote");
-  stakingStore.checkActiveValidatorsResponse = await ControlService.checkActiveValidators({
-    files: stakingStore.previewRemoteKeys.filter((k) => k.selected).map((k) => k.pubkey),
-    serviceID: stakingStore.selectedServiceToFilter.config?.serviceID,
-    isRemote: true,
-  });
+  stakingStore.checkActiveValidatorsResponse = await ControlService.checkActiveValidators(
+    {
+      files: stakingStore.previewRemoteKeys
+        .filter((k) => k.selected)
+        .map((k) => k.pubkey),
+      serviceID: stakingStore.selectedServiceToFilter.config?.serviceID,
+      isRemote: true,
+    }
+  );
   stakingStore.setActivePanel(null);
   if (
     stakingStore.checkActiveValidatorsResponse.length === 0 ||
@@ -826,7 +894,9 @@ const confirmImportRemoteKeys = async () => {
       useDeepClone({
         serviceID: stakingStore.selectedServiceToFilter.config?.serviceID,
         url: stakingStore.previewRemoteKeys[0]?.url,
-        pubkeys: stakingStore.previewRemoteKeys.filter((k) => k.selected).map((k) => k.pubkey),
+        pubkeys: stakingStore.previewRemoteKeys
+          .filter((k) => k.selected)
+          .map((k) => k.pubkey),
       })
     );
 
@@ -840,4 +910,17 @@ const confirmImportRemoteKeys = async () => {
 };
 
 //****End of Client Commands Buttons ****
+
+watchEffect(() => {
+  if (stakingStore.keys.length > 0 && setupStore.allSetups.length > 0) {
+    getKeySetupColor();
+  }
+});
+
+//Lifecycle Hooks
+
+onUnmounted(() => {
+  setupStore.selectedSetup = null;
+  getServerView();
+});
 </script>
diff --git a/launcher/src/components/UI/staking-page/components/list/panels/ValidatorPanel.vue b/launcher/src/components/UI/staking-page/components/list/panels/ValidatorPanel.vue
index 555c445f9..bb3be9a4a 100644
--- a/launcher/src/components/UI/staking-page/components/list/panels/ValidatorPanel.vue
+++ b/launcher/src/components/UI/staking-page/components/list/panels/ValidatorPanel.vue
@@ -7,13 +7,13 @@
         v-for="service in runningValidators"
         :key="service.config?.serviceID"
         class="col-span-1 colst w-24 h-full flex justify-start items-center hover:bg-slate-300 rounded-sm space-x-1 cursor-pointer transition-all duration-150 px-1"
-        :class="getBgColor(service.setupId).background"
+        :class="getBgColor(service.setupId)?.background"
         @click="pickValidator(service)"
       >
         <img class="w-5 h-5" :src="service.icon" alt="Service Icon" @mousedown.prevent />
         <span
           class="text-[10px] font-semibold hover:text-black transition-all duration-150"
-          :class="getBgColor(service.setupId).text"
+          :class="getBgColor(service.setupId)?.text"
           >{{ service.name }}</span
         >
       </div>
diff --git a/launcher/src/components/UI/staking-page/components/list/rows/KeyRow.vue b/launcher/src/components/UI/staking-page/components/list/rows/KeyRow.vue
index 0273ab485..ee67e2f7a 100644
--- a/launcher/src/components/UI/staking-page/components/list/rows/KeyRow.vue
+++ b/launcher/src/components/UI/staking-page/components/list/rows/KeyRow.vue
@@ -2,12 +2,18 @@ import { computed } from 'vue';
 <template>
   <div
     class="w-full h-8 rounded-full grid grid-cols-24 items-center p-1 cursor-pointer animate__animated animate__slideInLeft animate__delay-0.5s mt-1"
-    :class="[props.item?.selected ? 'bg-blue-400 ' : 'bg-gray-700 ', props.item?.showExitText ? 'bg-red-500 z-10' : '']"
+    :class="[
+      props.item?.selected ? 'bg-blue-400 ' : 'bg-gray-700 ',
+      props.item?.showExitText ? 'bg-red-500 z-10' : '',
+    ]"
     @click="selectKey(props.item)"
   >
-    <div class="col-start-1 col-span-1 self-center overflow-hidden flex justify-start items-center">
+    <div
+      class="col-start-1 col-span-1 self-center overflow-hidden flex justify-start items-center"
+    >
       <div
-        class="w-6 h-6 rounded-full cursor-pointer bg-white p-[2px]"
+        class="w-6 h-6 rounded-full cursor-pointer p-[2px]"
+        :class="setupStore.getBGColor(props.item?.color)"
         @mouseenter="footerStore.cursorLocation = `${props.item.isRemote ? rm : pk}`"
         @mouseleave="footerStore.cursorLocation = ''"
       >
@@ -155,6 +161,7 @@ import { computed } from "vue";
 import { useStakingStore } from "@/store/theStaking";
 import { useFooter } from "@/store/theFooter";
 import i18n from "@/includes/i18n";
+import { useSetups } from "../../../../../../store/setups";
 
 const props = defineProps({
   item: {
@@ -165,14 +172,17 @@ const props = defineProps({
 
 const stakingStore = useStakingStore();
 const footerStore = useFooter();
+const setupStore = useSetups();
 
 const t = i18n.global.t;
 //Key Status Icons
 const activeStatusIcon = "/img/icon/staking-page-icons/validator-state-active.png";
 const slashedStatusIcon = "/img/icon/staking-page-icons/validator-state-slashed.png";
-const depositStatusIcon = "/img/icon/staking-page-icons/validator-state-not-deposited.png";
+const depositStatusIcon =
+  "/img/icon/staking-page-icons/validator-state-not-deposited.png";
 const offlineStatusIcon = "/img/icon/staking-page-icons/validator-state-offline.png";
-const pendingStatusIcon = "/img/icon/staking-page-icons/validator-state-in-activation-queue.png";
+const pendingStatusIcon =
+  "/img/icon/staking-page-icons/validator-state-in-activation-queue.png";
 const exitedStatusIcon = "/img/icon/staking-page-icons/validator-state-exited.png";
 const apiProblems = "/img/icon/staking-page-icons/validator-state-unknown.png";
 const apiLoading = "/animation/loading/turning-circle.gif";
diff --git a/launcher/src/components/UI/staking-page/sections/SidebarSection.vue b/launcher/src/components/UI/staking-page/sections/SidebarSection.vue
index e05e8c156..ebc5f7dba 100644
--- a/launcher/src/components/UI/staking-page/sections/SidebarSection.vue
+++ b/launcher/src/components/UI/staking-page/sections/SidebarSection.vue
@@ -64,12 +64,21 @@ const hoveredIndex = ref(null);
 //Computed
 const installedValidators = computed(() => {
   let services = [];
-  if(setupStore.selectedSetup === null){
-    services =  serviceStore.installedServices.filter((s) => s.category === "validator" && !/SSVNetwork|Charon/.test(s.service))
-  }else{
+  if (setupStore.selectedSetup === null) {
+    services = serviceStore.installedServices.filter(
+      (s) => s.category === "validator" && !/SSVNetwork|Charon/.test(s.service)
+    );
+  } else {
     services = serviceStore.installedServices
-        .filter((s) => s.category === "validator" && !/SSVNetwork|Charon/.test(s.service) && setupStore.selectedSetup?.services?.map(s => s.config.serviceID).includes(s.config.serviceID))
-        .map((service) => ({ ...service, selected: false }));
+      .filter(
+        (s) =>
+          s.category === "validator" &&
+          !/SSVNetwork|Charon/.test(s.service) &&
+          setupStore.selectedSetup?.services
+            ?.map((s) => s.config.serviceID)
+            .includes(s.config.serviceID)
+      )
+      .map((service) => ({ ...service, selected: false }));
   }
   return services.sort((a, b) => a.name.localeCompare(b.name));
 });
@@ -83,7 +92,16 @@ onMounted(() => {
 //Methods
 
 const getCurrentService = () => {
+  if (setupStore.selectedSetup) {
+    const matchingService = installedValidators.value.find((validator) =>
+      setupStore.selectedSetup.services.some(
+        (service) => service.id === validator.config?.serviceID
+      )
+    );
+    currentService.value = matchingService?.config?.serviceID;
+  } else {
     currentService.value = installedValidators.value[0]?.config?.serviceID;
+  }
 };
 
 const getActiveValidator = () => {
diff --git a/launcher/src/components/base/BaseLayout.vue b/launcher/src/components/base/BaseLayout.vue
index a7aa03f54..ba2e44ed6 100755
--- a/launcher/src/components/base/BaseLayout.vue
+++ b/launcher/src/components/base/BaseLayout.vue
@@ -118,7 +118,7 @@ const UpdatePanelCompRef = ref(null);
 const isPageLoading = ref(false);
 
 const getLoadingAnime = computed(() => {
-  return "/animation/loading/robot-loader.gif";
+  return "/animation/setup/loader.gif";
 });