diff --git a/launcher/public/output.css b/launcher/public/output.css
index 61bfc22ff..b7e7a38ca 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.3 | MIT License | https://tailwindcss.com
 */
 
 /*
@@ -2571,6 +2571,11 @@ video {
           appearance: none;
 }
 
+.auto-cols-max{
+  grid-auto-columns: -webkit-max-content;
+  grid-auto-columns: max-content;
+}
+
 .grid-flow-row{
   grid-auto-flow: row;
 }
@@ -2881,6 +2886,12 @@ video {
   margin-bottom: calc(1px * var(--tw-space-y-reverse));
 }
 
+.space-y-3 > :not([hidden]) ~ :not([hidden]){
+  --tw-space-y-reverse: 0;
+  margin-top: calc(0.75rem * calc(1 - var(--tw-space-y-reverse)));
+  margin-bottom: calc(0.75rem * var(--tw-space-y-reverse));
+}
+
 .divide-x > :not([hidden]) ~ :not([hidden]){
   --tw-divide-x-reverse: 0;
   border-right-width: calc(1px * var(--tw-divide-x-reverse));
diff --git a/launcher/src/components/UI/custom-installation/components/CustomFooter.vue b/launcher/src/components/UI/custom-installation/components/CustomFooter.vue
index 262af0f68..967d48a5f 100644
--- a/launcher/src/components/UI/custom-installation/components/CustomFooter.vue
+++ b/launcher/src/components/UI/custom-installation/components/CustomFooter.vue
@@ -26,7 +26,6 @@ const props = defineProps({
   },
 });
 
-console.log("props", props.disabledBtn);
 const emit = defineEmits(["prepareStereum"]);
 
 const prepareStereum = () => {
diff --git a/launcher/src/components/UI/custom-installation/components/CustomPath.vue b/launcher/src/components/UI/custom-installation/components/CustomPath.vue
index f91fa0df2..3707af187 100755
--- a/launcher/src/components/UI/custom-installation/components/CustomPath.vue
+++ b/launcher/src/components/UI/custom-installation/components/CustomPath.vue
@@ -1,25 +1,21 @@
 <template>
-  <div
-    class="w-full h-full col-start-1 col-span-full row-start-1 row-span-full grid grid-cols-24 grid-rows-12"
-  >
+  <div class="w-full h-full col-start-1 col-span-full row-start-1 row-span-full grid grid-cols-24 grid-rows-12">
     <CustomHeader />
     <div
       class="w-full h-full col-start-1 col-span-full row-start-3 row-end-11 grid grid-cols-12 grid-rows-7 p-2 mx-auto"
     >
       <div
-        class="w-full h-full col-start-3 col-end-11 row-start-1 row-span-full bg-[#1E2429] rounded-md grid grid-cols-12 grid-rows-7 p-2"
+        class="w-full h-full col-start-3 col-end-11 row-start-1 row-span-full bg-[#1E2429] rounded-md grid grid-cols-12 grid-rows-7 p-4"
       >
-        <div
-          class="col-start-1 col-span-full row-start-1 row-span-2 flex justify-center items-center p-2"
-        >
-          <span class="text-left text-gray-200 text-sm">
+        <div class="col-start-1 col-span-full row-start-1 row-span-2 flex justify-center items-center p-2">
+          <span class="text-left text-gray-300 text-md font-sans font-semibold">
             {{ $t("customInstallation.customInstallationText") }}</span
           >
         </div>
         <div
           class="col-start-1 col-span-full row-start-3 row-span-full grid grid-cols-12 grid-rows-7 relative duration-500"
         >
-          <div
+          <!-- <div
             class="col-start-3 col-span-8 row-start-1 row-span-1 bg-gray-200 rounded-md grid grid-cols-6 cursor-pointer"
             @click="networkListDropdown = !networkListDropdown"
           >
@@ -69,20 +65,16 @@
                 >{{ item.name }}</span
               >
             </li>
-          </TransitionGroup>
+          </TransitionGroup> -->
           <div
-            class="w-full col-start-1 col-span-full row-start-3 row-span-full mx-auto flex flex-col justify-start items-center px-2"
+            class="w-full col-start-1 col-span-full row-start-2 row-span-full mx-auto flex flex-col justify-start items-center px-2"
           >
             <div class="w-full h-10 flex justify-center items-center">
               <span class="text-center text-gray-200 text-md">{{ inputTitle }}:</span>
             </div>
 
-            <div
-              class="w-full h-20 flex justify-center items-center p-4 bg-[#3d4449] rounded-full"
-            >
-              <div
-                class="w-full h-full bg-gray-300 rounded-full flex justify-start items-center"
-              >
+            <div class="w-full h-20 flex justify-center items-center p-4 bg-[#3d4449] rounded-full">
+              <div class="w-full h-full bg-gray-300 rounded-full flex justify-start items-center">
                 <input
                   v-model="userSelectedPath"
                   type="text"
@@ -105,21 +97,15 @@ import CustomHeader from "./CustomHead.vue";
 import ControlService from "@/store/ControlService";
 import { useRouter } from "vue-router";
 import { useNodeHeader } from "@/store/nodeHeader";
-import { useNodeManage } from "@/store/nodeManage";
 import { useClickInstall } from "@/store/clickInstallation";
 
 // Data
 
 const headerStore = useNodeHeader();
-const manageStore = useNodeManage();
 const clickStore = useClickInstall();
 
 const router = useRouter();
-const networkListDropdown = ref(false);
-// const selectedNetwork = ref("click to select a network");
 const userSelectedPath = ref("/opt/stereum");
-const selectedNetworkIcon = ref("");
-const selectedNetworkName = ref("");
 const inputTitle = ref("Choose your installation path where Stereum will be installed");
 const nextBtnDisabled = ref(false);
 const displayItem = ref("Click to select a network");
@@ -129,7 +115,7 @@ watch(userSelectedPath, (newValue) => {
 });
 
 watchEffect(() => {
-  if (userSelectedPath.value === "" || !selectedNetworkName.value) {
+  if (userSelectedPath.value === "") {
     nextBtnDisabled.value = true;
   } else {
     nextBtnDisabled.value = false;
@@ -150,21 +136,11 @@ onMounted(() => {
 });
 
 // Methods
-const selectNetwork = (network) => {
-  selectedNetworkIcon.value = network.icon;
-  selectedNetworkName.value = network.name;
-  manageStore.currentNetwork = network;
-  displayItem.value = network;
-  nextBtnDisabled.value = false;
-  networkListDropdown.value = false;
-};
 
 const getInstallPath = async () => {
   let largestVolumePath = await ControlService.getLargestVolumePath();
   if (largestVolumePath === "/") largestVolumePath += "opt";
-  const stereumInstallationPath = [largestVolumePath, "/stereum"]
-    .join("/")
-    .replace(/\/{2,}/, "/");
+  const stereumInstallationPath = [largestVolumePath, "/stereum"].join("/").replace(/\/{2,}/, "/");
   clickStore.installationPath = stereumInstallationPath;
 };
 
diff --git a/launcher/src/components/UI/edit-page/EditScreen.vue b/launcher/src/components/UI/edit-page/EditScreen.vue
index 7ac884a60..8b013e574 100644
--- a/launcher/src/components/UI/edit-page/EditScreen.vue
+++ b/launcher/src/components/UI/edit-page/EditScreen.vue
@@ -299,14 +299,6 @@ const listKeys = async (forceRefresh) => {
   await useListKeys(forceRefresh);
 };
 
-// const updateDisplayNetworkList = () => {
-//   if (manageStore.newConfiguration.length === 0) {
-//     manageStore.displayNetworkList = true;
-//   } else {
-//     manageStore.displayNetworkList = false;
-//   }
-// };
-
 // Random ID generator
 function generateRandomId() {
   const timestamp = new Date().getTime().toString(16);
@@ -516,7 +508,11 @@ const cancelChangeHandler = (item) => {
 
 const addServices = (service) => {
   let item = useDeepClone(service);
-  if (item?.category === "service" && manageStore.newConfiguration.map((s) => s.service).includes(item.service)) {
+  if (
+    item?.category === "service" &&
+    manageStore.newConfiguration.map((s) => s.service).includes(item.service) &&
+    setupStore.selectedSetup?.setupId === service?.setupId
+  ) {
     return;
   } else {
     item.id = manageStore.newConfiguration.length;
@@ -533,7 +529,8 @@ const addServices = (service) => {
 
 const addServerServices = (service) => {
   let item = useDeepClone(service);
-  if (item.category === "service" && manageStore.newConfiguration.map((s) => s.service).includes(item.service)) {
+
+  if (item.category === "service" && manageStore.newConfiguration.map((s) => s?.service).includes(item?.service)) {
     return;
   } else {
     item.id = manageStore.newConfiguration.length;
@@ -542,7 +539,9 @@ const addServerServices = (service) => {
       isNewClient: true,
     };
     manageStore.newConfiguration.push(newItem);
-    setupStore.editSetups.find((s) => s.setupId === setupStore.selectedSetup?.setupId).services.push(newItem);
+
+    setupStore.editSetups.find((s) => s.setupId === setupStore.selectedSetup?.setupId)?.services.push(newItem);
+
     clientToInstall.value = newItem;
     clientToInstall.value.addPanel = true;
   }
@@ -791,12 +790,14 @@ const destroyNode = async () => {
 // Confirm Changes methods
 const confirmHandler = async () => {
   manageStore.disableConfirmButton = true;
+
   const setupExists = manageStore.confirmChanges.some(
     (item) =>
       item.service?.hasOwnProperty("setupName") &&
       item.service?.hasOwnProperty("setupId") &&
       item.service.setupId == item.id
   );
+
   const serverServiceExists = manageStore.confirmChanges.some(
     (change) => change.content === "INSTALL" && setupStore.serverServices.includes(change.service.service)
   );
@@ -852,7 +853,6 @@ const handleSwitchSetupNetwork = async () => {
 };
 
 const resetState = async () => {
-  updateDom();
   manageStore.confirmChanges = [];
   manageStore.selectedNetwork = {};
   setupStore.selectedSetupToRemove = [];
@@ -860,7 +860,8 @@ const resetState = async () => {
   await listKeys();
   setTimeout(() => {
     manageStore.disableConfirmButton = false;
-  }, 2000);
+  }, 3000);
+  await updateDom();
 };
 
 const nukeConfirmation = () => {
diff --git a/launcher/src/components/UI/edit-page/components/drawer/DrawerMenu.vue b/launcher/src/components/UI/edit-page/components/drawer/DrawerMenu.vue
index 737292740..6a92b69d8 100644
--- a/launcher/src/components/UI/edit-page/components/drawer/DrawerMenu.vue
+++ b/launcher/src/components/UI/edit-page/components/drawer/DrawerMenu.vue
@@ -5,9 +5,7 @@
     <div
       class="col-start-1 col-span-full row-start-1 row-end-3 w-full h-full bg-[#232428] rounded-md flex flex-col justify-between items-center p-1"
     >
-      <span class="text-xs text-center text-gray-300 font-sans uppercase mt-1"
-        >Create a setup</span
-      >
+      <span class="text-xs text-center text-gray-300 font-sans uppercase mt-1">Create a setup</span>
 
       <div
         class="w-full h-7 bg-teal-700 rounded-[5px] text-center cursor-pointer hover:bg-teal-900 hover:scale-95 active:scale-90 transition-all duration-100"
@@ -19,9 +17,7 @@
     <div
       class="col-start-1 col-span-full row-start-3 row-end-5 w-full h-full bg-[#232428] rounded-md flex flex-col justify-between items-center p-1"
     >
-      <span class="text-xs text-center text-gray-300 font-sans uppercase mt-1"
-        >IMPORT A SETUP</span
-      >
+      <span class="text-xs text-center text-gray-300 font-sans uppercase mt-1">IMPORT A SETUP</span>
 
       <div
         class="w-full h-7 bg-teal-700 rounded-[5px] text-center cursor-pointer hover:bg-teal-900 hover:scale-95 active:scale-90 transition-all duration-100"
@@ -44,18 +40,13 @@
           v-for="service in getServerServices"
           :key="service"
           class="w-full h-7 min-h-7 bg-[#282a2c] hover:bg-gray-700 rounded-sm border border-gray-600 mx-auto shadow-md shadow-black grid grid-cols-6 items-center p-[2px] cursor-pointer overflow-hidden"
-          :class="service.isDuplicated ? 'pointer-events-none opacity-50' : ''"
+          :class="service?.isDuplicated ? 'pointer-events-none opacity-50' : ''"
           @dblclick="addService(service)"
         >
-          <img
-            class="w-5 h-5 col-start-1 col-span-1 mx-auto self-center"
-            :src="service.icon"
-            alt="Service Icon"
-          />
-          <span
-            class="col-start-2 col-span-full self-center text-xs text-gray-200 text-left font-sans truncate"
-            >{{ service.service }}</span
-          >
+          <img class="w-5 h-5 col-start-1 col-span-1 mx-auto self-center" :src="service.icon" alt="Service Icon" />
+          <span class="col-start-2 col-span-full self-center text-xs text-gray-200 text-left font-sans truncate">{{
+            service?.service
+          }}</span>
         </div>
       </div>
     </div>
@@ -77,13 +68,13 @@ const allServices = ref([]);
 
 const getServerServices = computed(() => {
   const newConfigServices = new Set(manageStore.newConfiguration.map((e) => e.service));
-  const serverServices = new Set(setupStore.serverServices.map((e) => e));
+  const serverServices = new Set(setupStore?.serverServices.map((e) => e));
 
   return allServices.value
     .filter((e) => e.category === "service" && serverServices.has(e.service))
     .map((service) => ({
       ...service,
-      isDuplicated: newConfigServices.has(service.service),
+      isDuplicated: newConfigServices.has(service?.service),
     }))
     .sort((a, b) => a.name.localeCompare(b.name));
 });
diff --git a/launcher/src/components/UI/edit-page/components/drawer/ServicesDrawer.vue b/launcher/src/components/UI/edit-page/components/drawer/ServicesDrawer.vue
index 65ff903e6..fc8e7c2dd 100644
--- a/launcher/src/components/UI/edit-page/components/drawer/ServicesDrawer.vue
+++ b/launcher/src/components/UI/edit-page/components/drawer/ServicesDrawer.vue
@@ -2,8 +2,7 @@
   <div
     class="w-full h-full col-start-1 col-span-full row-start-1 row-span-full grid grid-cols-6 grid-rows-15 items-center gap-y-1 bg-[#292e32] p-1 rounded-md"
   >
-    <span
-      class="col-start-1 col-span-full row-start-1 row-span-1 text-xs text-center text-gray-100 font-sans uppercase"
+    <span class="col-start-1 col-span-full row-start-1 row-span-1 text-xs text-center text-gray-100 font-sans uppercase"
       >ADD A CONFIG SERVICE</span
     >
     <DrawerFilter />
@@ -54,23 +53,16 @@
         @click="addServices(service)"
         @mouseenter="footerStore.cursorLocation = `${service.name} ${serv}`"
       >
-        <img
-          :src="service.icon"
-          alt="Client Icon"
-          class="col-start-1 col-span-1 w-full mx-auto"
-        />
-        <span
-          class="col-start-2 col-span-full w-full self-center text-xs text-gray-100 truncate ml-2"
-          >{{ service.name }}</span
-        >
+        <img :src="service.icon" alt="Client Icon" class="col-start-1 col-span-1 w-full mx-auto" />
+        <span class="col-start-2 col-span-full w-full self-center text-xs text-gray-100 truncate ml-2">{{
+          service.name
+        }}</span>
       </div>
     </div>
     <div
       class="col-start-1 col-span-full row-start-14 row-span-full w-full h-full bg-[#151618] rounded-md flex flex-col justify-between items-center p-1 shadow-sm shadow-black active:shadow-none border border-gray-700"
     >
-      <span class="text-xs text-center text-gray-100 font-sans uppercase mt-1"
-        >CUSTOM SERVICE</span
-      >
+      <span class="text-xs text-center text-gray-100 font-sans uppercase mt-1">CUSTOM SERVICE</span>
 
       <div
         class="w-full h-8 bg-teal-700 rounded-sm text-center p-1 cursor-pointer hover:bg-teal-900 transition-all duration-100"
@@ -109,13 +101,13 @@ const emit = defineEmits(["addServices", "startDrag"]);
 const filteredServices = computed(() => {
   return serviceStore.filteredServices
     .filter((service) => {
-      return !setupStore.serverServices.includes(service.service);
+      return !setupStore.serverServices.includes(service?.service);
     })
     .filter((service) => {
-      return service.service !== "CustomService";
+      return service?.service !== "CustomService";
     })
     .filter((service) => {
-      return service.name.toLowerCase().includes(searchQuery.value.toLowerCase());
+      return service?.name.toLowerCase().includes(searchQuery.value.toLowerCase());
     });
 });
 
diff --git a/launcher/src/components/UI/edit-page/components/edit/ConfigBody.vue b/launcher/src/components/UI/edit-page/components/edit/ConfigBody.vue
index 761ef8d19..e9b813a3e 100644
--- a/launcher/src/components/UI/edit-page/components/edit/ConfigBody.vue
+++ b/launcher/src/components/UI/edit-page/components/edit/ConfigBody.vue
@@ -75,7 +75,7 @@ import ExecutionClients from "./clients/ExecutionClients.vue";
 import ValidatorClients from "./clients/ValidatorClients.vue";
 
 import { useNodeManage } from "@/store/nodeManage";
-import { computed, onMounted, ref, watch } from "vue";
+import { computed, onMounted, ref } from "vue";
 import { useMultiSetups } from "../../../../../composables/multiSetups";
 import { useSetups } from "../../../../../store/setups";
 
@@ -105,12 +105,13 @@ const activateScrollBar = computed(() => {
 });
 
 //Update selected setup
-watch(
-  () => manageStore.newConfiguration,
-  () => {
-    updateDom();
-  }
-);
+// watch(
+//   () => manageStore.newConfiguration,
+//   () => {
+//     updateDom();
+
+//   }
+// );
 
 //Lifecycle Hooks
 onMounted(() => {
diff --git a/launcher/src/components/UI/edit-page/components/edit/setups/SetupDropdown.vue b/launcher/src/components/UI/edit-page/components/edit/setups/SetupDropdown.vue
index 544024a80..e34d77a5b 100644
--- a/launcher/src/components/UI/edit-page/components/edit/setups/SetupDropdown.vue
+++ b/launcher/src/components/UI/edit-page/components/edit/setups/SetupDropdown.vue
@@ -136,18 +136,14 @@ const serviceStore = useServices();
 const isOpen = ref(false);
 
 const setupsList = computed(() => {
-  const validators = serviceStore.installedServices
-    .filter((s) => s.category === "validator")
-    .map((v) => v.service);
+  const validators = serviceStore.installedServices.filter((s) => s.category === "validator").map((v) => v.service);
 
   let output = setupStore.allSetups.filter((s) => s.setupName !== "commonServices");
   output = output.map((setup) => {
     if (!setup.services || setup.services.length === 0) {
       setup.noValidator = true;
     } else {
-      const hasValidator = setup.services.some((service) =>
-        validators.includes(service.service)
-      );
+      const hasValidator = setup.services.some((service) => validators.includes(service.service));
       if (!hasValidator) {
         setup.noValidator = true;
       }
@@ -175,7 +171,7 @@ const getDropdownWidth = computed(() => {
 });
 
 const notShowServerViewInControl = computed(() => {
-  return route.path === "/control" ? false : true;
+  return route.path !== "/control";
 });
 
 const getSelectedOption = computed(() => {
diff --git a/launcher/src/components/UI/edit-page/components/modals/setups/SetupInfos.vue b/launcher/src/components/UI/edit-page/components/modals/setups/SetupInfos.vue
index e5f8c8498..b83e3867d 100644
--- a/launcher/src/components/UI/edit-page/components/modals/setups/SetupInfos.vue
+++ b/launcher/src/components/UI/edit-page/components/modals/setups/SetupInfos.vue
@@ -9,47 +9,27 @@
     @confirm-action="okButton"
   >
     <template #content>
-      <div class="flex flex-col justify-between items-center py-2 px-4 space-y-2 mt-10">
+      <div class="flex flex-col justify-between items-center py-2 px-4 space-y-1">
         <div class="w-full flex justify-center items-center">
           <div class="w-full grid grid-cols-12 items-center text-md">
-            <img
-              class="col-start-1 w-7 h-7"
-              src="/img/icon/edit-node-icons/service-item-icon.png"
-              alt="Client Icon"
-            />
+            <img class="col-start-1 w-7 h-7" src="/img/icon/edit-node-icons/service-item-icon.png" alt="Client Icon" />
             <span class="col-start-2 col-span-3 text-gray-400 text-left"> Setup ID </span>
-            <span class="col-start-6 col-end-13 text-amber-600 text-center">{{
-              getSelectedSetup.setupId
-            }}</span>
+            <span class="col-start-6 col-end-13 text-amber-600 text-center">{{ getSelectedSetup.setupId }}</span>
           </div>
         </div>
         <div class="w-full flex justify-center items-center">
           <div class="w-full grid grid-cols-12 items-center text-md">
-            <img
-              class="col-start-1 w-7 h-7"
-              src="/img/icon/edit-node-icons/service-category.png"
-              alt="Client Icon"
-            />
-            <span class="col-start-2 col-span-3 text-gray-400 text-left">
-              Setup Name
-            </span>
-            <span
-              v-if="getSelectedSetup"
-              class="col-start-6 col-end-13 text-lg text-gray-400 text-center capitalize"
-              >{{ getSelectedSetup.setupName }}</span
-            >
+            <img class="col-start-1 w-7 h-7" src="/img/icon/edit-node-icons/service-category.png" alt="Client Icon" />
+            <span class="col-start-2 col-span-3 text-gray-400 text-left"> Setup Name </span>
+            <span v-if="getSelectedSetup" class="col-start-6 col-end-13 text-lg text-gray-400 text-center capitalize">{{
+              getSelectedSetup.setupName
+            }}</span>
           </div>
         </div>
         <div class="w-full flex justify-center items-center">
           <div class="w-full grid grid-cols-12 items-center text-md">
-            <img
-              class="col-start-1 w-7 h-7"
-              src="/img/icon/edit-node-icons/service-category.png"
-              alt="Client Icon"
-            />
-            <span class="col-start-2 col-span-3 text-gray-400 text-left">
-              Setup Color
-            </span>
+            <img class="col-start-1 w-7 h-7" src="/img/icon/edit-node-icons/service-category.png" alt="Client Icon" />
+            <span class="col-start-2 col-span-3 text-gray-400 text-left"> Setup Color </span>
             <span
               v-if="getSelectedSetup"
               class="w-6 h-6 rounded-full col-start-8 col-span-1 text-lg text-gray-400 font-sans text-center capitalize"
@@ -64,22 +44,16 @@
         </div>
         <div class="w-full flex justify-center items-center">
           <div class="w-full grid grid-cols-12 items-center text-md">
-            <img
-              class="col-start-1 w-7 h-7"
-              src="/img/icon/edit-node-icons/service-category.png"
-              alt="Client Icon"
-            />
-            <span class="col-start-2 col-span-3 text-gray-400 text-left">
-              Included Services
-            </span>
+            <img class="col-start-1 w-7 h-7" src="/img/icon/edit-node-icons/service-category.png" alt="Client Icon" />
+            <span class="col-start-2 col-span-3 text-gray-400 text-left"> Included Services: </span>
           </div>
         </div>
 
-        <div class="w-full h-9 flex justify-start items-center space-x-2">
+        <div class="w-full h-9 grid grid-cols-3 gap-1">
           <span
             v-for="service in getSelectedSetup.services"
             :key="service.service"
-            class="col-start-2 col-span-1 text-xs text-gray-300 font-semibold text-center capitalize bg-teal-700 rounded-sm p-1"
+            class="col-span-1 text-xs text-gray-300 font-semibold text-center capitalize bg-teal-700 rounded-sm p-1"
             >{{ service.service }}</span
           >
         </div>
diff --git a/launcher/src/components/UI/node-page/components/node/SetupBody.vue b/launcher/src/components/UI/node-page/components/node/SetupBody.vue
index 98ca3f99e..42eb93fe5 100644
--- a/launcher/src/components/UI/node-page/components/node/SetupBody.vue
+++ b/launcher/src/components/UI/node-page/components/node/SetupBody.vue
@@ -13,7 +13,7 @@
       <span class="text-xs text-gray-300 text-center font-sans">All Setups</span>
     </div>
     <div
-      v-if="setupStore.allSetups.length > 0"
+      v-if="allNodeSetups.filter((s) => s.setupName !== 'commonServices').length > 0"
       class="w-full h-full col-start-1 col-span-full row-start-2 row-span-full grid grid-cols-3 grid-rows-3 scrollbar scrollbar-rounded-* scrollbar-thumb-teal-800 scrollbar-track-transparent overflow-y-auto overflow-x-hidden items-start"
     >
       <SingleSetup
diff --git a/launcher/src/components/UI/node-page/components/service/ServiceBody.vue b/launcher/src/components/UI/node-page/components/service/ServiceBody.vue
index 7a9222a0f..9906ed3bc 100755
--- a/launcher/src/components/UI/node-page/components/service/ServiceBody.vue
+++ b/launcher/src/components/UI/node-page/components/service/ServiceBody.vue
@@ -12,7 +12,10 @@
       ref="service"
       class="col-start-1 col-span-full row-start-2 row-span-full flex flex-col justify-start space-y-1 items-center overflow-x-hidden overflow-y-auto scrollbar scrollbar-rounded-* hover:scrollbar-thumb-teal-800 scrollbar-track-transparent px-1"
     >
-      <ServiceSkeleton v-for="i in skeletons" v-show="loadingClients" :key="i" />
+      <div v-if="loadingClients" class="space-y-3">
+        <ServiceSkeleton v-for="i in skeletons" :key="i" />
+      </div>
+
       <div
         v-for="item in getServices"
         :key="item"
diff --git a/launcher/src/components/UI/one-click/components/plugin/ConfigBody.vue b/launcher/src/components/UI/one-click/components/plugin/ConfigBody.vue
index 00aae4526..51e88a15d 100644
--- a/launcher/src/components/UI/one-click/components/plugin/ConfigBody.vue
+++ b/launcher/src/components/UI/one-click/components/plugin/ConfigBody.vue
@@ -106,7 +106,7 @@ const pluginChangeHandler = (plugin, item, idx) => {
 
   clickStore.selectedPreset.includedPlugins.splice(idx, 0, item);
 
-  if (["staking", "mev boost", "stereum on arm", "archive"].includes(clickStore.selectedPreset.name)) {
+  if (["staking", "mev boost", "stereum on arm", "archive", "lidocsm"].includes(clickStore.selectedPreset.name)) {
     if (item.category === "consensus") {
       let valIndex = clickStore.selectedPreset.includedPlugins.findIndex((e) => e.category === "validator");
       clickStore.selectedPreset.includedPlugins[valIndex] = serviceStore.allServices.find(
@@ -122,25 +122,6 @@ const pluginChangeHandler = (plugin, item, idx) => {
   sortPlugins();
 };
 
-// const pluginChangeHandler = (plugin, item, idx) => {
-//   plugin.openReplaceModal = false;
-
-//   clickStore.selectedPreset.includedPlugins[idx] = item;
-//   if (["staking", "mev boost", "stereum on arm", "archive"].includes(clickStore.selectedPreset.name)) {
-//     if (item.category === "consensus") {
-//       let valIndex = clickStore.selectedPreset.includedPlugins.findIndex((e) => e.category === "validator");
-//       clickStore.selectedPreset.includedPlugins[valIndex] = serviceStore.allServices.find(
-//         (e) => e.service === item.name + "ValidatorService"
-//       );
-//     } else if (item.category === "validator") {
-//       let conIndex = clickStore.selectedPreset.includedPlugins.findIndex((e) => e.category === "consensus");
-//       clickStore.selectedPreset.includedPlugins[conIndex] = serviceStore.allServices.find(
-//         (e) => e.service === item.name + "BeaconService"
-//       );
-//     }
-//   }
-// };
-
 const sortPlugins = () => {
   if (clickStore.selectedPreset.includedPlugins) {
     const ec = clickStore.selectedPreset.includedPlugins.filter((p) => p.category === "execution");
@@ -166,6 +147,7 @@ const pluginExChange = (el) => {
 const checkPluginCategory = (element) => {
   let filter;
   switch (clickStore.selectedPreset.name) {
+    case "lidocsm":
     case "staking":
       filter = (item) => item.category === element.category && !/(SSVNetwork|Web3Signer|Charon)/.test(item.service);
       if (manageStore.currentNetwork.network == "gnosis") {
diff --git a/launcher/src/components/UI/staking-page/StakingScreen.vue b/launcher/src/components/UI/staking-page/StakingScreen.vue
index a1bab487f..ba6d8bfc1 100644
--- a/launcher/src/components/UI/staking-page/StakingScreen.vue
+++ b/launcher/src/components/UI/staking-page/StakingScreen.vue
@@ -1,8 +1,6 @@
 <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
@@ -37,11 +35,7 @@
       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>
@@ -58,17 +52,21 @@ 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 } from "vue";
+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";
 
 //Store
 const stakingStore = useStakingStore();
 const serviceStore = useServices();
+const setupStore = useSetups();
 const { listGroups } = useListGroups();
+const { getServerView } = useMultiSetups();
 
 const modals = {
   import: {
@@ -131,6 +129,10 @@ watch(
 );
 
 //Lifecycle Hooks
+onUnmounted(() => {
+  setupStore.selectedSetup = null;
+  getServerView();
+});
 
 // *************** Methods *****************
 
@@ -188,37 +190,24 @@ 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;
@@ -246,10 +235,7 @@ 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);
@@ -266,9 +252,7 @@ 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 {
@@ -285,15 +269,13 @@ 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 ||
@@ -453,9 +435,7 @@ 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 = "";
@@ -470,9 +450,7 @@ 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;
@@ -498,9 +476,7 @@ 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 ****
@@ -510,12 +486,8 @@ 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]
@@ -551,12 +523,8 @@ 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) {
@@ -642,10 +610,7 @@ 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(
@@ -732,10 +697,7 @@ 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(
@@ -760,8 +722,7 @@ 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);
 };
@@ -792,11 +753,7 @@ 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);
@@ -855,15 +812,11 @@ 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 ||
@@ -873,9 +826,7 @@ 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),
       })
     );
 
diff --git a/launcher/src/components/UI/the-control/ControlScreen.vue b/launcher/src/components/UI/the-control/ControlScreen.vue
index 51ec96e9c..d9c3abe37 100644
--- a/launcher/src/components/UI/the-control/ControlScreen.vue
+++ b/launcher/src/components/UI/the-control/ControlScreen.vue
@@ -160,7 +160,7 @@ import { useSetups } from "@/store/setups";
 import { useMultiSetups } from "@/composables/multiSetups";
 import { useRouter } from "vue-router";
 
-const { getSelectedSetup } = useMultiSetups();
+const { getSelectedSetup, getServerView } = useMultiSetups();
 
 const t = i18n.global.t;
 
@@ -214,16 +214,14 @@ const selectSetup = (setup) => {
 
 onMounted(() => {
   updateServiceLogs();
-  polling = setInterval(updateServiceLogs, 10000); // refresh logs
-  if (setupStore.allSetups[0] === undefined) {
-    router.push("/node");
-  } else {
-    getSelectedSetup(setupStore.allSetups[0]);
-  }
+  polling = setInterval(updateServiceLogs, 10000);
+  console.log(setupStore.allSetups); // refresh logs
+  existanceSetups();
 });
 
 onUnmounted(() => {
   setupStore.selectedSetup = null;
+  getServerView();
   clearInterval(polling);
 });
 
@@ -236,6 +234,17 @@ watch(isAnyConsensusRunning, (newValue) => {
   footerStore.isConsensusRunning = newValue;
 });
 
+// Methods
+
+const existanceSetups = () => {
+  const filtered = setupStore.allSetups.filter((s) => s.setupName !== "commonServices");
+  if (!filtered.length) {
+    router.push("/node");
+  } else {
+    getSelectedSetup(filtered[0]);
+  }
+};
+
 const scrollUp = () => {
   if (pluginsTable.value) {
     pluginsTable.value.scrollTop -= 50;