diff --git a/web/src/assets/more.svg b/web/src/assets/more.svg
new file mode 100644
index 0000000000..44170fd4dd
--- /dev/null
+++ b/web/src/assets/more.svg
@@ -0,0 +1,6 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.99998 3.12329e-05C5.14342 3.12329e-05 3.3631 0.737595 2.05029 2.05032C0.73747 3.36304 0 5.14345 0 7.00002C0 8.85658 0.737564 10.6369 2.05029 11.9497C3.36301 13.2625 5.14342 14 6.99998 14C8.85655 14 10.6369 13.2624 11.9497 11.9497C13.2625 10.637 14 8.85658 14 7.00002C14 5.77126 13.6765 4.5641 13.0621 3.50001C12.4477 2.43591 11.564 1.55225 10.5 0.937877C9.43586 0.323501 8.2287 0 6.99995 0L6.99998 3.12329e-05ZM6.99998 12.6001C5.51476 12.6001 4.09045 12.0101 3.04029 10.9599C1.99013 9.90965 1.40016 8.4853 1.40016 7.00024C1.40016 5.51517 1.99013 4.0907 3.04029 3.04054C4.09057 1.99038 5.51492 1.40041 6.99998 1.40041C8.48505 1.40041 9.90952 1.99038 10.9597 3.04054C12.0098 4.09082 12.5998 5.51517 12.5998 7.00024C12.5998 7.98327 12.341 8.94896 11.8496 9.8003C11.3581 10.6516 10.6512 11.3585 9.79986 11.85C8.94855 12.3415 7.98283 12.6002 6.9998 12.6002L6.99998 12.6001Z" fill="#61175E"/>
+<path d="M4.79154 6.99999C4.79154 7.62243 4.28692 8.12693 3.6646 8.12693C3.04216 8.12693 2.53754 7.62239 2.53754 6.99999C2.53754 6.37758 3.04216 5.87305 3.6646 5.87305C4.28692 5.87305 4.79154 6.37758 4.79154 6.99999Z" fill="#61175E"/>
+<path d="M8.12687 6.99999C8.12687 7.62243 7.62233 8.12693 6.99993 8.12693C6.37752 8.12693 5.87299 7.62239 5.87299 6.99999C5.87299 6.37758 6.37752 5.87305 6.99993 5.87305C7.62233 5.87305 8.12687 6.37758 8.12687 6.99999Z" fill="#61175E"/>
+<path d="M11.4625 6.99999C11.4625 7.62243 10.9579 8.12693 10.3354 8.12693C9.71312 8.12693 9.2085 7.62239 9.2085 6.99999C9.2085 6.37758 9.71312 5.87305 10.3354 5.87305C10.9579 5.87305 11.4625 6.37758 11.4625 6.99999Z" fill="#61175E"/>
+</svg>
diff --git a/web/src/components/AttributeRow/AttributeRow.styled.ts b/web/src/components/AttributeRow/AttributeRow.styled.ts
index 4bf7568809..1ca4f639a6 100644
--- a/web/src/components/AttributeRow/AttributeRow.styled.ts
+++ b/web/src/components/AttributeRow/AttributeRow.styled.ts
@@ -2,11 +2,11 @@ import {InfoCircleOutlined} from '@ant-design/icons';
 import {Tag as AntdTag, Typography} from 'antd';
 import styled from 'styled-components';
 import TestOutputMark from 'components/TestOutputMark';
+import moreIcon from 'assets/more.svg';
 
 export {default as AttributeTitle} from './AttributeTitle';
 
 export const Container = styled.div`
-  align-items: center;
   background-color: ${({theme}) => theme.color.white};
   display: flex;
   margin-bottom: 4px;
@@ -74,3 +74,7 @@ export const OutputsMark = styled(TestOutputMark)`
     margin: 4px;
   }
 `;
+
+export const MoreIcon = styled.img.attrs({
+  src: moreIcon,
+})``;
diff --git a/web/src/components/AttributeRow/AttributeRow.tsx b/web/src/components/AttributeRow/AttributeRow.tsx
index a07dd78530..376ec77bfd 100644
--- a/web/src/components/AttributeRow/AttributeRow.tsx
+++ b/web/src/components/AttributeRow/AttributeRow.tsx
@@ -1,4 +1,3 @@
-import {MoreOutlined} from '@ant-design/icons';
 import {Dropdown, Menu, Popover} from 'antd';
 import parse from 'html-react-parser';
 import MarkdownIt from 'markdown-it';
@@ -125,8 +124,8 @@ const AttributeRow = ({
       </S.Header>
 
       <Dropdown overlay={menu}>
-        <a onClick={e => e.preventDefault()}>
-          <MoreOutlined />
+        <a onClick={e => e.preventDefault()} style={{height: 'fit-content'}}>
+          <S.MoreIcon />
         </a>
       </Dropdown>
     </S.Container>
diff --git a/web/src/components/CreateTestPlugins/Default/steps/BasicDetails/BasicDetailsForm.tsx b/web/src/components/CreateTestPlugins/Default/steps/BasicDetails/BasicDetailsForm.tsx
index bd16a6ded3..c55c87517d 100644
--- a/web/src/components/CreateTestPlugins/Default/steps/BasicDetails/BasicDetailsForm.tsx
+++ b/web/src/components/CreateTestPlugins/Default/steps/BasicDetails/BasicDetailsForm.tsx
@@ -31,6 +31,7 @@ const BasicDetailsForm = ({
         <Form.Item
           className="input-name"
           data-cy="create-test-name-input"
+          data-tour={StepsID.Trigger}
           label="Name"
           name="name"
           rules={[{required: true, message: 'Please enter a test name'}]}
@@ -41,7 +42,6 @@ const BasicDetailsForm = ({
         <Form.Item
           className="input-description"
           data-cy="create-test-description-input"
-          data-tour={StepsID.Trigger}
           label="Description"
           name="description"
           style={{marginBottom: 0}}
diff --git a/web/src/components/CreateTestPlugins/Rest/steps/RequestDetails/RequestDetailsHeadersInput.tsx b/web/src/components/CreateTestPlugins/Rest/steps/RequestDetails/RequestDetailsHeadersInput.tsx
index cea6a3a20b..e4802050f7 100644
--- a/web/src/components/CreateTestPlugins/Rest/steps/RequestDetails/RequestDetailsHeadersInput.tsx
+++ b/web/src/components/CreateTestPlugins/Rest/steps/RequestDetails/RequestDetailsHeadersInput.tsx
@@ -1,7 +1,6 @@
 import {PlusOutlined} from '@ant-design/icons';
 import {Button, Form} from 'antd';
 import {DEFAULT_HEADERS, IKeyValue} from 'constants/Test.constants';
-import React from 'react';
 import Editor from 'components/Editor';
 import {SupportedEditors} from 'constants/Editor.constants';
 import * as S from './RequestDetails.styled';
@@ -11,14 +10,16 @@ interface IProps {
   name?: string[];
   unit?: string;
   label?: string;
+  className?: string;
 }
-const RequestDetailsHeadersInput: React.FC<IProps> = ({
+const RequestDetailsHeadersInput = ({
   unit = 'Header',
   name = ['headers'],
   initialValue = DEFAULT_HEADERS,
   label = 'Header',
-}) => (
-  <Form.Item className="input-headers" label={`${label} list`} shouldUpdate>
+  className = '',
+}: IProps) => (
+  <Form.Item className={`input-headers ${className}`} label={`${label} list`} shouldUpdate>
     <Form.List name={name.length === 1 ? name[0] : name} initialValue={initialValue}>
       {(fields, {add, remove}) => (
         <>
@@ -50,7 +51,7 @@ const RequestDetailsHeadersInput: React.FC<IProps> = ({
             style={{fontWeight: 600, height: 'auto', padding: 0}}
             type="link"
           >
-            {`Add ${label}`}
+            Add {label}
           </Button>
         </>
       )}
diff --git a/web/src/components/GuidedTour/testRunSteps.ts b/web/src/components/GuidedTour/testRunSteps.ts
index 038f768c54..300341bff1 100644
--- a/web/src/components/GuidedTour/testRunSteps.ts
+++ b/web/src/components/GuidedTour/testRunSteps.ts
@@ -9,13 +9,6 @@ export enum StepsID {
 }
 
 const Steps: Step[] = [
-  {
-    title: 'Response',
-    target: GuidedTourService.getStepSelector(StepsID.Response),
-    content: 'View various responses here. When the test is finished, you will get the following results.',
-    placement: 'left',
-    disableBeacon: true,
-  },
   {
     title: 'Trigger',
     target: GuidedTourService.getStepSelector(StepsID.Trigger),
@@ -24,6 +17,13 @@ const Steps: Step[] = [
       'You can change the trigger by altering the details and saving. This will rerun the test with the updated trigger.',
     disableBeacon: true,
   },
+  {
+    title: 'Response',
+    target: GuidedTourService.getStepSelector(StepsID.Response),
+    content: 'View various responses here. When the test is finished, you will get the following results.',
+    placement: 'left',
+    disableBeacon: true,
+  },
   {
     title: 'Mode Switcher',
     target: '.ant-tabs-nav-wrap',
diff --git a/web/src/components/Settings/DataStorePlugin/DataStorePluginForm.styled.ts b/web/src/components/Settings/DataStorePlugin/DataStorePluginForm.styled.ts
index 0daacb5cc7..cd4a00331b 100644
--- a/web/src/components/Settings/DataStorePlugin/DataStorePluginForm.styled.ts
+++ b/web/src/components/Settings/DataStorePlugin/DataStorePluginForm.styled.ts
@@ -1,6 +1,7 @@
 import {DeleteOutlined} from '@ant-design/icons';
 import {Button, Typography} from 'antd';
 import styled from 'styled-components';
+import RequestDetailsHeadersInput from 'components/CreateTestPlugins/Rest/steps/RequestDetails/RequestDetailsHeadersInput';
 
 export const FormContainer = styled.div`
   display: grid;
@@ -59,3 +60,7 @@ export const Title = styled(Typography.Title)`
     margin: 0;
   }
 `;
+
+export const HeadersInput = styled(RequestDetailsHeadersInput)`
+  max-width: 1000px;
+`;
diff --git a/web/src/components/Settings/DataStorePlugin/forms/GrpcClient/GrpcClient.tsx b/web/src/components/Settings/DataStorePlugin/forms/GrpcClient/GrpcClient.tsx
index 3d06aebc52..91bea4e87d 100644
--- a/web/src/components/Settings/DataStorePlugin/forms/GrpcClient/GrpcClient.tsx
+++ b/web/src/components/Settings/DataStorePlugin/forms/GrpcClient/GrpcClient.tsx
@@ -1,9 +1,8 @@
 import {Checkbox, Col, Form, Input, Row, Select, Space, Switch} from 'antd';
-
-import RequestDetailsHeadersInput from 'components/CreateTestPlugins/Rest/steps/RequestDetails/RequestDetailsHeadersInput';
 import {SupportedDataStoresToDefaultEndpoint} from 'constants/DataStore.constants';
 import {SupportedDataStores, TDraftDataStore} from 'types/DataStore.types';
 import * as S from './GrcpClient.styled';
+import * as FS from '../../DataStorePluginForm.styled';
 import GrpcClientSecure from './GrpcClientSecure';
 
 const COMPRESSION_LIST = [
@@ -78,7 +77,7 @@ const GrpcClient = () => {
 
       <Row gutter={[16, 16]}>
         <Col span={12}>
-          <RequestDetailsHeadersInput initialValue={HEADER_DEFAULT_VALUES} name={[...baseName, 'rawHeaders']} />
+          <FS.HeadersInput initialValue={HEADER_DEFAULT_VALUES} name={[...baseName, 'rawHeaders']} />
         </Col>
       </Row>
 
diff --git a/web/src/components/Settings/DataStorePlugin/forms/HttpClient/HttpClient.tsx b/web/src/components/Settings/DataStorePlugin/forms/HttpClient/HttpClient.tsx
index d2f638dc53..c2ab48aca1 100644
--- a/web/src/components/Settings/DataStorePlugin/forms/HttpClient/HttpClient.tsx
+++ b/web/src/components/Settings/DataStorePlugin/forms/HttpClient/HttpClient.tsx
@@ -1,7 +1,7 @@
 import {Checkbox, Col, Form, Input, Row, Space, Switch} from 'antd';
-import RequestDetailsHeadersInput from 'components/CreateTestPlugins/Rest/steps/RequestDetails/RequestDetailsHeadersInput';
 import {TDraftDataStore} from 'types/DataStore.types';
 import GrpcClientSecure from '../GrpcClient/GrpcClientSecure';
+import * as S from '../../DataStorePluginForm.styled';
 
 const HEADER_DEFAULT_VALUES = [{key: '', value: ''}];
 
@@ -23,7 +23,7 @@ const HttpClient = () => {
 
       <Row gutter={[16, 16]}>
         <Col span={12}>
-          <RequestDetailsHeadersInput initialValue={HEADER_DEFAULT_VALUES} name={[...baseName, 'rawHeaders']} />
+          <S.HeadersInput initialValue={HEADER_DEFAULT_VALUES} name={[...baseName, 'rawHeaders']} />
         </Col>
       </Row>