diff --git a/GUI/src/components/Collapsible/Collapsible.scss b/GUI/src/components/Collapsible/Collapsible.scss
index cbff36533..2e47cec93 100644
--- a/GUI/src/components/Collapsible/Collapsible.scss
+++ b/GUI/src/components/Collapsible/Collapsible.scss
@@ -39,6 +39,10 @@
     background-color: get-color(white);
     border-radius: 0 0 4px 4px;
     overflow: hidden;
+
+    &[data-state='open'] {
+      overflow: visible;
+    }
   }
 }
 
diff --git a/GUI/src/components/DynamicList/index.tsx b/GUI/src/components/DynamicList/index.tsx
index 1813ef57e..f10a16150 100644
--- a/GUI/src/components/DynamicList/index.tsx
+++ b/GUI/src/components/DynamicList/index.tsx
@@ -15,7 +15,7 @@ type DynamicListProps = {
   tooltipText?: string;
 };
 
-const DynamicList: FC<DynamicListProps> = ({ label, labelWidth = 120, value, onChange, placeholder, tooltipText }) => {
+const DynamicList: FC<DynamicListProps> = ({ label, labelWidth = 170, value, onChange, placeholder, tooltipText }) => {
   const { t } = useTranslation();
   const items = value?.length > 0 ? value : [''];
 
diff --git a/GUI/src/components/FlowElementsPopup/index.tsx b/GUI/src/components/FlowElementsPopup/index.tsx
index 2c98dbcbe..7b64f69e4 100644
--- a/GUI/src/components/FlowElementsPopup/index.tsx
+++ b/GUI/src/components/FlowElementsPopup/index.tsx
@@ -450,11 +450,6 @@ const FlowElementsPopup: React.FC = () => {
             <Tabs.Trigger className="vertical-tabs__trigger" value={t('serviceFlow.tabs.setup')}>
               {t('serviceFlow.tabs.setup')}
             </Tabs.Trigger>
-            {!isReadonly && (
-              <Tabs.Trigger className="vertical-tabs__trigger" value={t('serviceFlow.tabs.test')}>
-                {t('serviceFlow.tabs.test')}
-              </Tabs.Trigger>
-            )}
           </Tabs.List>
           <Tabs.Content value={t('serviceFlow.tabs.setup')} className="vertical-tabs__body">
             {stepType === StepType.Textfield && (
diff --git a/GUI/src/components/Toast/Toast.scss b/GUI/src/components/Toast/Toast.scss
index f39d9ac75..c168a7b1d 100644
--- a/GUI/src/components/Toast/Toast.scss
+++ b/GUI/src/components/Toast/Toast.scss
@@ -80,7 +80,7 @@
     color: var(--dark-text-secondary);
   }
 
-  &__list {
+  &__list:not(:empty) {
     background-color: var(--dark-bg-extra-light);
   }
 
diff --git a/GUI/src/components/chat/chat.module.scss b/GUI/src/components/chat/chat.module.scss
index b7fc359ce..fb0c137e7 100644
--- a/GUI/src/components/chat/chat.module.scss
+++ b/GUI/src/components/chat/chat.module.scss
@@ -79,7 +79,6 @@
   overflow-y: auto;
   overflow-x: hidden;
   margin-bottom: auto;
-  height: 20em;
 }
 
 .message {
@@ -381,6 +380,7 @@
   &.client {
     .content {
       background-color: #764ca0;
+      color: white;
     }
   }
 
@@ -388,7 +388,7 @@
     .main {
       .content {
         background-color: get-color(sapphire-blue-12);
-        color: var(--dark-bg-extra-light);
+        color: white;
 
         a {
           color: #a8d4ff;
@@ -404,18 +404,17 @@
 }
 
 [data-theme='dark'] .system {
+  color: white;
+
   &.success {
-    color: get-color(sea-green-11);
     background: get-color(sea-green-6);
   }
 
   &.error {
-    color: get-color(jasper-11);
     background: get-color(jasper-6);
   }
 
   &.info {
-    color: get-color(sapphire-blue-11);
     background: get-color(sapphire-blue-6);
   }
 
diff --git a/GUI/src/i18n/en/common.json b/GUI/src/i18n/en/common.json
index 406b9d6cd..5f29867e7 100644
--- a/GUI/src/i18n/en/common.json
+++ b/GUI/src/i18n/en/common.json
@@ -151,13 +151,13 @@
     "edit": "Edit",
     "delete": "Delete",
     "cancel": "Cancel",
-    "importMany": "Import many",
+    "importMany": "Import",
     "import": {
       "importSuccess": "{{count}} service{{lengthCheck}} imported successfully",
       "importFailure": "Could not import the following files (Wrong format or corrupted): {{files}}",
       "failedToImport": "Failed to import services"
     },
-    "exportMany": "Export many",
+    "exportMany": "Export",
     "exportAll": "Export All",
     "export": "Export",
     "exportAllConfirmation": "Are you sure you want to export all services?",
@@ -247,7 +247,7 @@
     "examples": {
       "title": "Examples",
       "placeholder": "Add examples of what the user could ask to start the service",
-      "tooltip": "Enter sample user questions that trigger this service (e.g., ‘When is Midsummer festival?’)"
+      "tooltip": "Enter sample user questions that trigger this service (e.g. ‘When is Midsummer festival?’). It is recommended to include at least 5 examples"
     },
     "keywords": {
       "title": "Keywords",
@@ -336,7 +336,7 @@
     "chooseMemorySlots": "Choose memory slots"
   },
   "serviceFlow": {
-    "serviceConfiguration": "Service Configuration",
+    "serviceConfiguration": "Settings",
     "element": {
       "taraAuthentication": "Tara authorization",
       "textfield": "Send message to client",
@@ -394,7 +394,7 @@
       "or": "OR",
       "not": "NOT",
       "addRule": "+ Rule",
-      "addElement": "+ Element",
+      "addElement": "+ New variable",
       "addGroup": "+ Group",
       "remove": "Remove",
       "signType": "Sign Type",
@@ -408,7 +408,7 @@
       "confirmImport": "The current service will be rewritten!"
     },
     "previousVariables": {
-      "assignElements": "Assign Elements",
+      "assignElements": "Assigned Variables",
       "dateAndTime": {
         "title": "Date and time",
         "base": "Base",
diff --git a/GUI/src/i18n/et/common.json b/GUI/src/i18n/et/common.json
index 8f39f1da2..240270766 100644
--- a/GUI/src/i18n/et/common.json
+++ b/GUI/src/i18n/et/common.json
@@ -151,13 +151,13 @@
     "edit": "Muuda",
     "delete": "Kustuta",
     "cancel": "Tühista",
-    "importMany": "Impordi mitu",
+    "importMany": "Impordi",
     "import": {
       "importSuccess": "{{count}} teenus{{lengthCheck}} edukalt imporditud",
       "importFailure": "Järgmisi faile ei õnnestunud importida (vale vorming või rikutud): {{files}}",
       "failedToImport": "Teenuste importimine ebaõnnestus"
     },
-    "exportMany": "Ekspordi mitu",
+    "exportMany": "Ekspordi",
     "exportAll": "Ekspordi kõik",
     "export": "Ekspordi",
     "exportAllConfirmation": "Kas olete kindel, et soovite eksportida kõik teenused?",
@@ -244,7 +244,7 @@
     "examples": {
       "title": "Näidisküsimused",
       "placeholder": "Lisa näiteid, mida kasutaja võiks küsida, et teenus käivituks",
-      "tooltip": "Sisesta näidisküsimused, mille kaudu teenus käivitub (nt. ‘Millal on Jaanipäev?’)"
+      "tooltip": "Sisesta näidisküsimused, mille kaudu teenus käivitub (nt. ‘Millal on Jaanipäev?’). Soovituslik on lisada vähemalt 5 näidet."
     },
     "keywords": {
       "title": "Märksõnad",
@@ -336,7 +336,7 @@
     "chooseMemorySlots": "Vali mälukohad"
   },
   "serviceFlow": {
-    "serviceConfiguration": "Teenuse seaded",
+    "serviceConfiguration": "Seaded",
     "element": {
       "taraAuthentication": "TARA autentimine",
       "textfield": "Sõnum kliendile",
@@ -394,7 +394,7 @@
       "or": "VÕI",
       "not": "MITTE",
       "addRule": "+ Reegel",
-      "addElement": "+ Element",
+      "addElement": "+ Uus väärtus",
       "addGroup": "+ Grupp",
       "remove": "Eemalda",
       "signType": "Märgi tüüp",
@@ -408,7 +408,7 @@
       "confirmImport": "Teenus kirjutatakse üle!"
     },
     "previousVariables": {
-      "assignElements": "Määra elemendid",
+      "assignElements": "Määratud Väärtused",
       "noName": "<Nimeta>",
       "environmentVariables": {
         "title": "Keskkonnamuutujad"
diff --git a/GUI/src/pages/ServiceFlowPage.scss b/GUI/src/pages/ServiceFlowPage.scss
index cdf1d9c1c..5a7821063 100644
--- a/GUI/src/pages/ServiceFlowPage.scss
+++ b/GUI/src/pages/ServiceFlowPage.scss
@@ -77,22 +77,28 @@
     }
 
     &.selected {
-      border: dashed 1px get-color(black-coral-1);
+      border: dashed 2px get-color(black-coral-5);
+      box-shadow: 0 0 0 3px rgba(0, 0, 0, 0.08);
 
       &.end {
-        border: 1px solid get-color(jasper-15);
+        border: 2px solid get-color(jasper-15);
+        box-shadow: 0 0 0 3px rgba(get-color(jasper-10), 0.25);
       }
       &.step {
-        border: 1px solid get-color(sapphire-blue-7);
+        border: 2px solid get-color(sapphire-blue-7);
+        box-shadow: 0 0 0 3px rgba(get-color(sapphire-blue-7), 0.2);
       }
       &.rule {
-        border: 1px solid get-color(black-coral-8);
+        border: 2px solid get-color(black-coral-8);
+        box-shadow: 0 0 0 3px rgba(get-color(black-coral-8), 0.2);
       }
       &.finishing-step {
-        border: 1px solid get-color(jasper-8);
+        border: 2px solid get-color(jasper-8);
+        box-shadow: 0 0 0 3px rgba(get-color(jasper-8), 0.2);
       }
       &.dynamic-choices {
-        border: 1px solid get-color(purple-8);
+        border: 2px solid get-color(purple-8);
+        box-shadow: 0 0 0 3px rgba(get-color(purple-8), 0.2);
       }
     }
 
@@ -186,6 +192,18 @@
   }
 }
 
+[data-theme='light'] .react-flow {
+  &__edge {
+    &.selected {
+      .react-flow__edge-path {
+        stroke: get-color(sapphire-blue-9);
+        stroke-width: 2.5px;
+        filter: drop-shadow(0 0 4px rgba(23, 105, 171, 0.2));
+      }
+    }
+  }
+}
+
 .edge-button {
   pointer-events: all;
   cursor: pointer;
@@ -213,12 +231,6 @@
   &__node {
     color: var(--dark-text-secondary);
 
-    &.selected {
-      &.step {
-        border: 1px solid get-color(sapphire-blue-2);
-      }
-    }
-
     &.start,
     &.end {
       color: get-color(white);
@@ -262,14 +274,46 @@
     }
 
     &.selected {
-      border: dashed 1px get-color(black-coral-10);
+      border: dashed 2px get-color(black-coral-8);
+      box-shadow: 0 0 0 3px rgba(255, 255, 255, 0.08);
+
+      &.end {
+        border: 2px solid get-color(jasper-11);
+        box-shadow: 0 0 0 3px rgba(200, 60, 60, 0.25);
+      }
+      &.step {
+        border: 2px solid get-color(sapphire-blue-2);
+        box-shadow: 0 0 0 3px rgba(80, 140, 220, 0.25);
+      }
+      &.rule {
+        border: 2px solid get-color(black-coral-8);
+        box-shadow: 0 0 0 3px rgba(150, 150, 160, 0.25);
+      }
+      &.finishing-step {
+        border: 2px solid get-color(jasper-11);
+        box-shadow: 0 0 0 3px rgba(200, 60, 60, 0.25);
+      }
+      &.dynamic-choices {
+        border: 2px solid get-color(purple-11);
+        box-shadow: 0 0 0 3px rgba(140, 80, 200, 0.25);
+      }
     }
   }
 
   &__edge-path {
-    stroke: get-color(black-coral-10);
+    stroke: get-color(black-coral-6);
     stroke-width: 1.5px;
   }
+
+  &__edge {
+    &.selected {
+      .react-flow__edge-path {
+        stroke: get-color(sapphire-blue-4);
+        stroke-width: 2.5px;
+        filter: drop-shadow(0 0 5px rgba(139, 180, 213, 0.2));
+      }
+    }
+  }
 }
 
 [data-theme='dark'] .edge-button {