diff --git a/frontend/webapp/containers/main/actions/action-form-body/index.tsx b/frontend/webapp/containers/main/actions/action-form-body/index.tsx
index cc55afe26f..d2980da378 100644
--- a/frontend/webapp/containers/main/actions/action-form-body/index.tsx
+++ b/frontend/webapp/containers/main/actions/action-form-body/index.tsx
@@ -35,7 +35,12 @@ export const ActionFormBody: React.FC<Props> = ({ isUpdate, action, formData, ha
 
       {!isUpdate && <SectionTitle title='' description={action.docsDescription as string} actionButton={<DocsButton endpoint={action.docsEndpoint} />} />}
 
-      <MonitoringCheckboxes allowedSignals={action.allowedSignals} selectedSignals={formData.signals} setSelectedSignals={(value) => handleFormChange('signals', value)} />
+      <MonitoringCheckboxes
+        title='Signals for Processing'
+        allowedSignals={action.allowedSignals}
+        selectedSignals={formData.signals}
+        setSelectedSignals={(value) => handleFormChange('signals', value)}
+      />
 
       {!isUpdate && <Input title='Action name' placeholder='Use a name that describes the action' value={formData.name} onChange={({ target: { value } }) => handleFormChange('name', value)} />}
 
diff --git a/frontend/webapp/containers/main/overview/multi-source-control/index.tsx b/frontend/webapp/containers/main/overview/multi-source-control/index.tsx
index b54856a0d8..10e92314bd 100644
--- a/frontend/webapp/containers/main/overview/multi-source-control/index.tsx
+++ b/frontend/webapp/containers/main/overview/multi-source-control/index.tsx
@@ -1,7 +1,6 @@
 import React, { useMemo, useState } from 'react';
 import Image from 'next/image';
 import { slide } from '@/styles';
-import theme from '@/styles/theme';
 import { useAppStore } from '@/store';
 import styled from 'styled-components';
 import { DeleteWarning } from '@/components';
@@ -69,11 +68,20 @@ const MultiSourceControl = () => {
         </Button>
 
         <Button variant='tertiary' onClick={() => setIsWarnModalOpen(true)}>
+          <Image src='/icons/common/circled-cross.svg' alt='' width={20} height={20} />
+          <Text family='secondary' decoration='underline'>
+            Uninstrument
+          </Text>
+        </Button>
+
+        {/* exists in FIGMA, but has same functionality - exclude until we change instrumented behaviour */}
+
+        {/* <Button variant='tertiary' onClick={() => setIsWarnModalOpen(true)}>
           <Image src='/icons/common/trash.svg' alt='' width={16} height={16} />
           <Text family='secondary' decoration='underline' color={theme.text.error}>
-            Delete
+            Remove
           </Text>
-        </Button>
+        </Button> */}
       </Transition>
 
       <DeleteWarning
diff --git a/frontend/webapp/reuseable-components/input-list/index.tsx b/frontend/webapp/reuseable-components/input-list/index.tsx
index 26ce29e183..9611b502c7 100644
--- a/frontend/webapp/reuseable-components/input-list/index.tsx
+++ b/frontend/webapp/reuseable-components/input-list/index.tsx
@@ -110,7 +110,7 @@ const InputList: React.FC<InputListProps> = ({ initialValues = [], value, onChan
 
       {rows.map((val, idx) => (
         <InputRow key={`input-list-${idx}`}>
-          <Input value={val} onChange={(e) => handleInputChange(e.target.value, idx)} autoFocus={rows.length > 1 && idx === rows.length - 1} />
+          <Input value={val} onChange={(e) => handleInputChange(e.target.value, idx)} autoFocus={!val && rows.length > 1 && idx === rows.length - 1} />
           <DeleteButton disabled={isDelButtonDisabled} onClick={() => handleDeleteInput(idx)}>
             <Image src='/icons/common/trash.svg' alt='Delete' width={16} height={16} />
           </DeleteButton>
diff --git a/frontend/webapp/reuseable-components/input-table/index.tsx b/frontend/webapp/reuseable-components/input-table/index.tsx
index c158c116ce..fb5805d6c1 100644
--- a/frontend/webapp/reuseable-components/input-table/index.tsx
+++ b/frontend/webapp/reuseable-components/input-table/index.tsx
@@ -132,18 +132,22 @@ export const InputTable: React.FC<Props> = ({ columns, initialValues = [], value
         <tbody>
           {rows.map((row, idx) => (
             <tr key={`input-table-row-${idx}`} style={{ height: '50px' }}>
-              {columns.map(({ type, keyName, placeholder }, innerIdx) => (
-                <td key={`input-table-${idx}-${keyName}`} style={{ maxWidth, padding: '0 2px' }}>
-                  <Input
-                    type={type}
-                    placeholder={placeholder}
-                    value={row[keyName]}
-                    onChange={({ target: { value: val } }) => handleChange(keyName, type === 'number' ? Number(val) : val, idx)}
-                    autoFocus={rows.length > 1 && idx === rows.length - 1 && innerIdx === 0}
-                    style={{ maxWidth, paddingLeft: 10 }}
-                  />
-                </td>
-              ))}
+              {columns.map(({ type, keyName, placeholder }, innerIdx) => {
+                const value = row[keyName];
+
+                return (
+                  <td key={`input-table-${idx}-${keyName}`} style={{ maxWidth, padding: '0 2px' }}>
+                    <Input
+                      type={type}
+                      placeholder={placeholder}
+                      value={value}
+                      onChange={({ target: { value: val } }) => handleChange(keyName, type === 'number' ? Number(val) : val, idx)}
+                      autoFocus={!value && rows.length > 1 && idx === rows.length - 1 && innerIdx === 0}
+                      style={{ maxWidth, paddingLeft: 10 }}
+                    />
+                  </td>
+                );
+              })}
 
               <td>
                 <DeleteButton disabled={isDelButtonDisabled} onClick={() => handleDeleteRow(idx)}>
diff --git a/frontend/webapp/reuseable-components/key-value-input-list/index.tsx b/frontend/webapp/reuseable-components/key-value-input-list/index.tsx
index 2824906d27..c995a471b5 100644
--- a/frontend/webapp/reuseable-components/key-value-input-list/index.tsx
+++ b/frontend/webapp/reuseable-components/key-value-input-list/index.tsx
@@ -108,18 +108,18 @@ export const KeyValueInputsList: React.FC<KeyValueInputsListProps> = ({ initialK
   };
 
   // Check if any key or value field is empty
-  const isAddButtonDisabled = rows.some((pair) => pair.key.trim() === '' || pair.value.trim() === '');
+  const isAddButtonDisabled = rows.some(({ key, value }) => key.trim() === '' || value.trim() === '');
   const isDelButtonDisabled = rows.length <= 1;
 
   return (
     <Container>
       <FieldLabel title={title} required={required} tooltip={tooltip} />
 
-      {rows.map((pair, idx) => (
+      {rows.map(({ key, value }, idx) => (
         <Row key={`key-value-input-list-${idx}`}>
-          <Input placeholder='Attribute name' value={pair.key} onChange={(e) => handleChange('key', e.target.value, idx)} autoFocus={rows.length > 1 && idx === rows.length - 1} />
+          <Input placeholder='Attribute name' value={key} onChange={(e) => handleChange('key', e.target.value, idx)} autoFocus={!value && rows.length > 1 && idx === rows.length - 1} />
           <Image src='/icons/common/arrow-right.svg' alt='Arrow' width={16} height={16} />
-          <Input placeholder='Attribute value' value={pair.value} onChange={(e) => handleChange('value', e.target.value, idx)} />
+          <Input placeholder='Attribute value' value={value} onChange={(e) => handleChange('value', e.target.value, idx)} />
           <DeleteButton disabled={isDelButtonDisabled} onClick={() => handleDeleteRow(idx)}>
             <Image src='/icons/common/trash.svg' alt='Delete' width={16} height={16} />
           </DeleteButton>