diff --git a/apps/dashboard/src/main/java/com/akto/action/BurpJarAction.java b/apps/dashboard/src/main/java/com/akto/action/BurpJarAction.java
index 537382cf0d..26a92426f7 100644
--- a/apps/dashboard/src/main/java/com/akto/action/BurpJarAction.java
+++ b/apps/dashboard/src/main/java/com/akto/action/BurpJarAction.java
@@ -64,6 +64,7 @@ public String fetchBurpCredentials() {
         apiToken = ApiTokensDao.instance.findOne(
                 Filters.and(
                         Filters.eq(ApiToken.USER_NAME, getSUser().getLogin()),
+                        Filters.eq(ApiToken.ACCOUNT_ID, Context.accountId.get()),
                         Filters.eq(ApiToken.UTILITY, ApiToken.Utility.BURP)
                 )
         );
diff --git a/apps/dashboard/src/main/java/com/akto/action/testing/StartTestAction.java b/apps/dashboard/src/main/java/com/akto/action/testing/StartTestAction.java
index f4f7aefd2d..59dff5577d 100644
--- a/apps/dashboard/src/main/java/com/akto/action/testing/StartTestAction.java
+++ b/apps/dashboard/src/main/java/com/akto/action/testing/StartTestAction.java
@@ -26,6 +26,9 @@
 import com.akto.util.Constants;
 import com.akto.util.enums.GlobalEnums.TestErrorSource;
 import com.akto.utils.Utils;
+import com.google.gson.Gson;
+import com.google.gson.JsonParser;
+import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.Filters;
 import com.mongodb.client.model.Projections;
@@ -71,6 +74,7 @@ public class StartTestAction extends UserAction {
     private Map<String,Long> allTestsCountMap = new HashMap<>();
     private Map<String,Integer> issuesSummaryInfoMap = new HashMap<>();
     private String testRoleId;
+    private static final Gson gson = new Gson();
 
     private static List<ObjectId> getTestingRunListFromSummary(Bson filters) {
         Bson projections = Projections.fields(
@@ -480,23 +484,46 @@ public String fetchVulnerableTestRunResults() {
             List<TestingRunResult> testingRunResultList = TestingRunResultDao.instance.findAll(filters, skip, 50, null);
             Map<String, String> sampleDataVsCurlMap = new HashMap<>();
             for (TestingRunResult runResult: testingRunResultList) {
-                List<GenericTestResult> testResults = new ArrayList<>();
-                // todo: fix
+                WorkflowTest workflowTest = runResult.getWorkflowTest();
                 for (GenericTestResult tr : runResult.getTestResults()) {
-                    TestResult testResult = (TestResult) tr;
-                    if (testResult.isVulnerable()) {
-                        testResults.add(testResult);
-                        sampleDataVsCurlMap.put(testResult.getMessage(),
-                                ExportSampleDataAction.getCurl(testResult.getMessage()));
-                        sampleDataVsCurlMap.put(testResult.getOriginalMessage(),
-                                ExportSampleDataAction.getCurl(testResult.getOriginalMessage()));
+                    if (tr.isVulnerable()) {
+                        if (tr instanceof TestResult) {
+                            TestResult testResult = (TestResult) tr;
+                            sampleDataVsCurlMap.put(testResult.getMessage(),
+                                    ExportSampleDataAction.getCurl(testResult.getMessage()));
+                            sampleDataVsCurlMap.put(testResult.getOriginalMessage(),
+                                    ExportSampleDataAction.getCurl(testResult.getOriginalMessage()));
+                        } else if (tr instanceof MultiExecTestResult){
+                            MultiExecTestResult testResult = (MultiExecTestResult) tr;
+                            Map<String, WorkflowTestResult.NodeResult> nodeResultMap = testResult.getNodeResultMap();
+                            for (String order : nodeResultMap.keySet()) {
+                                WorkflowTestResult.NodeResult nodeResult = nodeResultMap.get(order);
+                                String nodeResultLastMessage = getNodeResultLastMessage(nodeResult.getMessage());
+                                if (nodeResultLastMessage != null) {
+                                    nodeResult.setMessage(nodeResultLastMessage);
+                                    sampleDataVsCurlMap.put(nodeResultLastMessage,
+                                            ExportSampleDataAction.getCurl(nodeResultLastMessage));
+                                }
+                            }
+                        }
+                    }
+                }
+                if (workflowTest != null) {
+                    Map<String, WorkflowNodeDetails> nodeDetailsMap = workflowTest.getMapNodeIdToWorkflowNodeDetails();
+                    for (String nodeName: nodeDetailsMap.keySet()) {
+                        if (nodeDetailsMap.get(nodeName) instanceof YamlNodeDetails) {
+                            YamlNodeDetails details = (YamlNodeDetails) nodeDetailsMap.get(nodeName);
+                            sampleDataVsCurlMap.put(details.getOriginalMessage(),
+                                    ExportSampleDataAction.getCurl(details.getOriginalMessage()));
+                        }
+
                     }
                 }
-                runResult.setTestResults(testResults);
             }
             this.testingRunResults = testingRunResultList;
             this.sampleDataVsCurlMap = sampleDataVsCurlMap;
         } catch (Exception e) {
+            loggerMaker.errorAndAddToDb("Error while executing test run summary" + e.getMessage(), LogDb.DASHBOARD);
             addActionError("Invalid test summary id");
             return ERROR.toUpperCase();
         }
@@ -504,6 +531,15 @@ public String fetchVulnerableTestRunResults() {
         return SUCCESS.toUpperCase();
     }
 
+    private String getNodeResultLastMessage(String message) {
+        if (StringUtils.isEmpty(message) || "[]".equals(message)) {
+            return null;
+        }
+        List listOfMessage = gson.fromJson(message, List.class);
+        Object vulnerableMessage = listOfMessage.get(listOfMessage.size() - 1);
+        return gson.toJson(vulnerableMessage);
+    }
+
     private String testingRunResultHexId;
     private TestingRunResult testingRunResult;
 
diff --git a/apps/dashboard/web/pages/login.jsp b/apps/dashboard/web/pages/login.jsp
index 4b2700e25f..bcb41d34c0 100644
--- a/apps/dashboard/web/pages/login.jsp
+++ b/apps/dashboard/web/pages/login.jsp
@@ -131,19 +131,9 @@
                     // the user will always see the old login screen
                     script.type = "text/javascript"
                     if (window.RELEASE_VERSION_GLOBAL == '' || window.RELEASE_VERSION_GLOBAL == 'akto-release-version') {// Case when akto version is not available
-                        if (window.AKTO_UI_MODE == 'VERSION_2') {
-                            script.src = "/polaris_web/web/dist/main.js";
-                        } else {
-                            script.src = "/dist/main.js";
-                        }
-                    } else if (window.RELEASE_VERSION == '' || window.RELEASE_VERSION == 'akto-release-version') {
-                        script.src = "https://d1hvi6xs55woen.cloudfront.net/web/" + window.RELEASE_VERSION_GLOBAL + "/dist/main.js";;
+                        script.src = "/polaris_web/web/dist/main.js";
                     } else {
-                        if (window.AKTO_UI_MODE == 'VERSION_2') {
-                            script.src = "https://d1hvi6xs55woen.cloudfront.net/polaris_web/" + window.RELEASE_VERSION + "/dist/main.js";
-                        } else {
-                            script.src = "https://d1hvi6xs55woen.cloudfront.net/web/" + window.RELEASE_VERSION + "/dist/main.js";
-                        }
+                        script.src = "https://d1hvi6xs55woen.cloudfront.net/polaris_web/" + window.RELEASE_VERSION_GLOBAL + "/dist/main.js";;
                     }
                     document.body.appendChild(script);
                 </script>
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/PasswordTextField.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/PasswordTextField.jsx
index 4e5d46be7e..b856667e76 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/PasswordTextField.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/PasswordTextField.jsx
@@ -26,6 +26,7 @@ function PasswordTextField(props) {
     return (
         <TextField suffix={toggleButton} value={props.field} type={type} helpText={props.helpText} 
                     onChange={handleValueChange} label={props.label ? props.label : null}
+                    monospaces={props?.monospaced}
         />
     )
 }
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiEndpoints.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiEndpoints.jsx
index ea0bc59410..9fa0ae3923 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiEndpoints.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiEndpoints.jsx
@@ -31,11 +31,13 @@ const headings = [
         text: "Endpoint",
         value: "endpointComp",
         title: "Api endpoints",
+        textValue: "endpoint"
     },
     {
         text: "Risk score",
         title: "Risk score",
         value: "riskScoreComp",
+        textValue: "riskScore"
     },
     {
         text: "Hostname",
@@ -56,20 +58,22 @@ const headings = [
         title: 'Auth type',
         value: 'auth_type',
         showFilter: true,
-        type: CellType.TEXT,
+        textValue: 'authTypeTag'
     },
     {
         text: 'Sensitive Params',
         title: 'Sensitive params',
         value: 'sensitiveTagsComp',
         filterKey: 'sensitiveTags',
-        showFilter: true
+        showFilter: true,
+        textValue: "sensitiveDataTags"
     },
     {
         text: 'Last Seen',
         title: 'Last seen',
         value: 'last_seen',
         isText: true,
+        type: CellType.TEXT
     }
 ]
 
@@ -77,7 +81,8 @@ let headers = JSON.parse(JSON.stringify(headings))
 headers.push({
     text: 'Method',
     filterKey: 'method',
-    showFilter: true
+    showFilter: true,
+    textValue: 'method',
 })
 
 
@@ -322,7 +327,7 @@ function ApiEndpoints() {
 
     function exportCsv() {
         if (!loading) {
-            let headerTextToValueMap = Object.fromEntries(headers.map(x => [x.text, x.value]).filter(x => x[0].length > 0));
+            let headerTextToValueMap = Object.fromEntries(headers.map(x => [x.text, x.type === CellType.TEXT ? x.value : x.textValue]).filter(x => x[0].length > 0));
 
             let csv = Object.keys(headerTextToValueMap).join(",") + "\r\n"
             const allEndpoints = endpointData['All']
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/transform.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/transform.js
index df784edc6a..0574c6a1f8 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/transform.js
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/transform.js
@@ -487,7 +487,8 @@ const transform = {
                 sensitiveTagsComp: this.prettifySubtypes(url.sensitiveTags),
                 riskScoreComp: <Badge status={this.getStatus(score)} size="small">{score.toString()}</Badge>,
                 riskScore: score,
-                isNew: this.isNewEndpoint(url.lastSeenTs)
+                isNew: this.isNewEndpoint(url.lastSeenTs),
+                sensitiveDataTags: url?.sensitiveTags.join(" "),
             }
         })
 
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/ExportHtml/ExportHtml.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/ExportHtml/ExportHtml.jsx
index 0b2f4ff5e2..3987a64197 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/ExportHtml/ExportHtml.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/ExportHtml/ExportHtml.jsx
@@ -3,51 +3,20 @@ import { useParams } from 'react-router-dom'
 import issuesApi from '../../issues/api';
 import api from '../api';
 import PersistStore from '../../../../main/PersistStore';
-import { Avatar, Box, Frame, HorizontalGrid, HorizontalStack, LegacyCard, Text, TopBar, VerticalStack, Icon} from '@shopify/polaris'
-import {FlagMajor, CollectionsMajor, ResourcesMajor, InfoMinor, CreditCardSecureMajor, FraudProtectMajor} from "@shopify/polaris-icons"
+import { Avatar, Box, Frame, HorizontalGrid, HorizontalStack, LegacyCard, Text, TopBar, VerticalStack, Icon } from '@shopify/polaris'
+import { FlagMajor, CollectionsMajor, ResourcesMajor, InfoMinor, CreditCardSecureMajor, FraudProtectMajor } from "@shopify/polaris-icons"
 import './styles.css'
 import transform from '../transform';
 
 function ExportHtml() {
-    const params = useParams() ;
+    const params = useParams();
     const testingRunSummaryId = params.summaryId
     const issuesFilter = params.issuesFilter
-    const moreInfoSections = [
-        {
-            icon: InfoMinor,
-            title: "Description",
-            content: ""
-        },
-        {
-          icon: FlagMajor,
-          title: "Impact",
-          content: ""
-        },
-        {
-          icon: CollectionsMajor,
-          title: "Tags",
-          content: ""
-        },
-        {
-            icon: CreditCardSecureMajor,
-            title: "CWE",
-            content: ""
-        },
-        {
-            icon: FraudProtectMajor,
-            title: "CVE",
-            content: ""
-        },
-        {
-          icon: ResourcesMajor,
-          title: "References",
-          content: ""
-        }
-    ]
-
-    const [vulnerableResultsMap, setVulnerableResultsMap] = useState([]) ;
+    let  moreInfoSections = transform.getInfoSectionsHeaders().filter(item => item.title !== 'Jira')
+    
+    const [vulnerableResultsMap, setVulnerableResultsMap] = useState([]);
     const [dataToCurlObj, setDataToCurlObj] = useState({});
-    const [severitiesCount,setSeveritiesCount] = useState({HIGH: 0, MEDIUM: 0, LOW: 0}) ;
+    const [severitiesCount, setSeveritiesCount] = useState({ HIGH: 0, MEDIUM: 0, LOW: 0 });
     const collectionsMap = PersistStore(state => state.collectionsMap)
 
     const subCategoryMap = PersistStore(state => state.subCategoryMap)
@@ -66,15 +35,15 @@ function ExportHtml() {
             let severity = subCategory?.superCategory?.severity?._name
             let severityIndex = 0;
             switch (severity) {
-                case 'HIGH': 
+                case 'HIGH':
                     ++high
                     severityIndex = 2
                     break;
-                case 'MEDIUM': 
+                case 'MEDIUM':
                     ++medium
                     severityIndex = 1
                     break;
-                case 'LOW': 
+                case 'LOW':
                     ++low
                     severityIndex = 0
                     break;
@@ -95,7 +64,7 @@ function ExportHtml() {
             vulnerabilities['severityIndex'] = severityIndex
             categoryVsVulMap[subtype] = vulnerabilities
         })
-        setSeveritiesCount({HIGH: high, MEDIUM: medium, LOW: low});
+        setSeveritiesCount({ HIGH: high, MEDIUM: medium, LOW: low });
         let localCopy = vulnerableResultsMap
         Object.keys(categoryVsVulMap).forEach((category) => {
             let obj = categoryVsVulMap[category]
@@ -112,17 +81,17 @@ function ExportHtml() {
     }
 
     const fetchVulnerableData = async () => {
-        let resultsCount = 0 ;
+        let resultsCount = 0;
         let vulnerableTestingRunResults = []
         let sampleDataVsCurlMap = {}
 
         if (testingRunSummaryId) {
-            while(true){
+            while (true) {
                 let testingRunCountsFromDB = 0
-                await api.fetchVulnerableTestingRunResults(testingRunSummaryId,resultsCount).then((resp)=>{
+                await api.fetchVulnerableTestingRunResults(testingRunSummaryId, resultsCount).then((resp) => {
                     vulnerableTestingRunResults = [...vulnerableTestingRunResults, ...resp.testingRunResults]
                     testingRunCountsFromDB = resp.testingRunResults.length
-                    sampleDataVsCurlMap = {...sampleDataVsCurlMap, ...resp.sampleDataVsCurlMap}
+                    sampleDataVsCurlMap = { ...sampleDataVsCurlMap, ...resp.sampleDataVsCurlMap }
                 })
                 resultsCount += 50
                 if (testingRunCountsFromDB < 50) {
@@ -137,7 +106,7 @@ function ExportHtml() {
                 await issuesApi.fetchVulnerableTestingRunResultsFromIssues(filters, resultsCount).then(resp => {
                     vulnerableTestingRunResults = [...vulnerableTestingRunResults, ...resp.testingRunResults]
                     testingRunCountsFromDB = resp.totalIssuesCount
-                    sampleDataVsCurlMap = {...sampleDataVsCurlMap, ...resp.sampleDataVsCurlMap}
+                    sampleDataVsCurlMap = { ...sampleDataVsCurlMap, ...resp.sampleDataVsCurlMap }
                 })
                 resultsCount += 50
                 if (testingRunCountsFromDB < 50 || resultsCount >= 1000) {
@@ -150,18 +119,18 @@ function ExportHtml() {
         createVulnerabilityMap(vulnerableTestingRunResults)
     }
 
-    useEffect(()=>{
+    useEffect(() => {
         fetchVulnerableData()
-    },[])
+    }, [])
 
     const headerComp = (
         <div className="header-css">
             <Box width="60%">
                 <HorizontalStack align="space-between">
                     <Box paddingBlockStart={3}>
-                        <Avatar size="medium" shape="square" source="/public/akto_colored.svg" customer name='aktoLogo'/>
+                        <Avatar size="medium" shape="square" source="/public/akto_colored.svg" customer name='aktoLogo' />
                     </Box>
-                    <Text variant="headingXl">Akto Vulnerabilities Report</Text> 
+                    <Text variant="headingXl">Akto Vulnerabilities Report</Text>
                 </HorizontalStack>
             </Box>
         </div>
@@ -170,15 +139,15 @@ function ExportHtml() {
         <TopBar secondaryMenu={headerComp} />
     )
 
-    const getColor = (item) =>{
-        switch(item.category.severityIndex){
+    const getColor = (item) => {
+        switch (item.category.severityIndex) {
             case 0:
                 return "bg-caution"
 
-            case 1 :
+            case 1:
                 return "bg-warning"
 
-            case 2 :
+            case 2:
                 return "bg-critical"
 
             default:
@@ -191,20 +160,20 @@ function ExportHtml() {
     }
 
 
-    const cardTitleComponent = (item) =>{
-        return(
+    const cardTitleComponent = (item) => {
+        return (
             <Box borderWidth="1" background={getColor(item)}>
                 <HorizontalStack>
-                <Box borderInlineEndWidth='1' width='35%'>
-                    <Box padding={1}>
-                        <Text variant="headingMd">Vulnerability</Text>
+                    <Box borderInlineEndWidth='1' width='35%'>
+                        <Box padding={1}>
+                            <Text variant="headingMd">Vulnerability</Text>
+                        </Box>
                     </Box>
-                </Box>
-                <Box>
-                    <Box padding={1}>
-                        <Text variant="headingMd">{item?.category.testName}</Text>
+                    <Box>
+                        <Box padding={1}>
+                            <Text variant="headingMd">{item?.category.testName}</Text>
+                        </Box>
                     </Box>
-                </Box>
                 </HorizontalStack>
             </Box>
         )
@@ -212,14 +181,14 @@ function ExportHtml() {
 
     return (
         <Frame topBar={headerEditor}>
-            <div className="html-component" style={{padding: "32px"}}>
+            <div className="html-component" style={{ padding: "32px" }}>
                 <VerticalStack gap="5">
 
                     <VerticalStack gap="3">
                         <Text variant="headingLg" fontWeight="medium">Summary of alerts</Text>
                         <Box borderWidth="2" borderRadius="1" width="40%">
                             <HorizontalGrid columns={2}>
-                                <div style={{background: "#666666", borderRight: '2px solid white',borderBottom: '2px solid white'}}>
+                                <div style={{ background: "#666666", borderRight: '2px solid white', borderBottom: '2px solid white' }}>
                                     <HorizontalStack align="center">
                                         <Box padding="1">
                                             <Text variant="bodyLg" fontWeight="medium" color="text-inverse">
@@ -228,7 +197,7 @@ function ExportHtml() {
                                         </Box>
                                     </HorizontalStack>
                                 </div>
-                                <div style={{background: "#666666",borderBottom: '2px solid white'}}>
+                                <div style={{ background: "#666666", borderBottom: '2px solid white' }}>
                                     <HorizontalStack align="center">
                                         <Box padding="1">
                                             <Text variant="bodyLg" fontWeight="medium" color="text-inverse">
@@ -238,9 +207,9 @@ function ExportHtml() {
                                     </HorizontalStack>
                                 </div>
                             </HorizontalGrid>
-                            {Object.keys(severitiesCount)?.map((element, index)=>(
+                            {Object.keys(severitiesCount)?.map((element, index) => (
                                 <HorizontalGrid columns={2} key={index}>
-                                    <div style={{background: "#e8e8e8", borderRight: '2px solid white', borderBottom: (index < 2 ? "2px solid white" : "")}}>
+                                    <div style={{ background: "#e8e8e8", borderRight: '2px solid white', borderBottom: (index < 2 ? "2px solid white" : "") }}>
                                         <HorizontalStack align="center">
                                             <Box padding="1">
                                                 <Text variant="bodyMd" fontWeight="medium">
@@ -249,7 +218,7 @@ function ExportHtml() {
                                             </Box>
                                         </HorizontalStack>
                                     </div>
-                                    <div style={{background: "#e8e8e8",borderBottom: (index < 2 ? "2px solid white" : "")}}>
+                                    <div style={{ background: "#e8e8e8", borderBottom: (index < 2 ? "2px solid white" : "") }}>
                                         <HorizontalStack align="center">
                                             <Box padding="1">
                                                 <Text variant="bodyMd" fontWeight="medium">
@@ -266,7 +235,7 @@ function ExportHtml() {
                     <VerticalStack gap={4}>
                         <Text variant="headingLg" fontWeight="medium">Vulnerabilities details</Text>
                         <VerticalStack gap={3}>
-                            {vulnerableResultsMap?.map((item,index)=>(
+                            {vulnerableResultsMap?.map((item, index) => (
                                 <LegacyCard sectioned title={cardTitleComponent(item)} key={index}>
                                     <LegacyCard.Section>
                                         <MoreInformationComponent
@@ -287,8 +256,7 @@ function ExportHtml() {
     )
 }
 
-function MoreInformationComponent(props) {
-    
+function VulnerableMultiStepTestDetails(props) {
     const getTruncatedString = (str) => {
         if (str && str.length > 3000) {
             return str.substr(0, 3000) + '  .........';
@@ -300,102 +268,219 @@ function MoreInformationComponent(props) {
         return props.dataToCurlObj[message]
     }
 
+    const getResponse = (message) => {
+        let messageJson = JSON.parse(message)
+        if (messageJson['response']) {
+            return JSON.stringify(messageJson['response'])
+        }
+        return JSON.stringify({ "statusCode": messageJson['statusCode'], "body": messageJson['responsePayload'], "headers": messageJson['responseHeaders'] })
+    }
+
+    return (
+        <div>
+            <div className="attempts-div" key={props.index}>
+                {Object.keys(props.testingRun.workflowTest.mapNodeIdToWorkflowNodeDetails).map((stepId, index) => {
+                    let step = props.testingRun.workflowTest.mapNodeIdToWorkflowNodeDetails[stepId]
+                    let nodeResultMap = props.testingRun.testResults[0].nodeResultMap[stepId]
+                    if (nodeResultMap.message !== '[]') {
+                        let attempt = nodeResultMap.message
+                        return (
+                            <div key={index}>
+                                <div className="row-div-1">
+                                    <HorizontalStack gap={1}>
+                                        <span className="api-text">
+                                            Vulnerable endpoint:
+                                        </span>
+                                        <span className="url-text">
+                                            {step.apiInfoKey.url}
+                                        </span>
+                                    </HorizontalStack>
+                                    <HorizontalStack>
+                                        <Box paddingInlineEnd={4}>
+                                            <span className="api-text">
+                                                Collection name: {" "}
+                                            </span>
+                                            <span className="url-text">
+                                                {props.collectionsMap[step.apiInfoKey.apiCollectionId]}
+                                            </span>
+                                        </Box>
+                                    </HorizontalStack>
+                                </div>
+                                <div>
+                                    <div className="row-div">
+                                        <span className="title-name" style={{ fontWeight: "500" }}>
+                                            Original request
+                                        </span>
+                                        <span className="url-name" style={{ fontWeight: "500" }}>
+                                            Attempt
+                                        </span>
+                                    </div>
+                                    <div className="row-div">
+                                        <span className="message" style={{ borderRight: "1px solid #47466A73" }}>
+                                            {getTruncatedString(getOriginalCurl(step.originalMessage))}
+                                        </span>
+                                        <span className="message">
+                                            {getTruncatedString(getOriginalCurl(attempt))}
+                                        </span>
+                                    </div>
+                                    <div className="row-div">
+                                        <span className="title-name" style={{ fontWeight: "500" }}>
+                                            Original Response
+                                        </span>
+                                        <span className="url-name" style={{ fontWeight: "500" }}>
+                                            Attempt Response
+                                        </span>
+                                    </div>
+                                    <div className="row-div">
+                                        <span className="message" style={{ borderRight: "1px solid #47466A73" }}>
+                                            {getTruncatedString(getResponse(step.originalMessage))}
+                                        </span>
+                                        <span className="message">
+                                            {getTruncatedString(getResponse(attempt))}
+                                        </span>
+                                    </div>
+                                </div>
+                            </div>
+
+                        )
+                    }
+                })}
+
+            </div>
+        </div>
+    )
+
+}
+
+
+function VulnerableEndpointDetails(props) {
+    const getTruncatedString = (str) => {
+        if (str && str.length > 3000) {
+            return str.substr(0, 3000) + '  .........';
+        }
+        return str;
+    }
+
+    const getOriginalCurl = (message) => {
+        return props.dataToCurlObj[message]
+    }
 
     const getResponse = (message) => {
         let messageJson = JSON.parse(message)
         if (messageJson['response']) {
             return JSON.stringify(messageJson['response'])
         }
-        return JSON.stringify({"statusCode":messageJson['statusCode'],  "body": messageJson['responsePayload'],   "headers": messageJson['responseHeaders']})
+        return JSON.stringify({ "statusCode": messageJson['statusCode'], "body": messageJson['responsePayload'], "headers": messageJson['responseHeaders'] })
     }
+
     return (
-      <VerticalStack gap={"4"}>
-        <LegacyCard>
-          <LegacyCard.Section>
-            {
-              props.sections?.map((section, index) => {
-                return (<LegacyCard.Subsection key={index}>
-                  <VerticalStack gap="3">
-                    <HorizontalStack gap="2" align="start" blockAlign='start'>
-                      <div style={{ maxWidth: "0.875rem", maxHeight: "0.875rem" }}>
-                        {section?.icon && <Icon source={section.icon}></Icon>}
-                      </div>
-                      <Text variant='headingSm'>
-                        {section.title || "Heading"}
-                      </Text>
-                    </HorizontalStack>
-                    {section.content}
-                  </VerticalStack>
-                </LegacyCard.Subsection>)
-              })
-            }
-          </LegacyCard.Section>
-          <LegacyCard.Section>
-            {props.item?.category?.vulnerableTestingRunResults?.map((testingRun, index)=> (
-                <div className="attempts-div" key={index}>
-                    <div className="row-div-1">
-                        <HorizontalStack gap={1}>
-                            <span className="api-text">
-                                Vulnerable endpoint: 
-                            </span>
-                            <span className="url-text">
-                                { testingRun.apiInfoKey.url }
-                            </span>
-                        </HorizontalStack>
-                        <HorizontalStack>
-                            <Box paddingInlineEnd={4}>
-                                <span className="api-text">
-                                    Collection name: {" "}
-                                </span>
-                                <span className="url-text">
-                                    { props.collectionsMap[testingRun.apiInfoKey.apiCollectionId]} 
-                                </span>
-                            </Box>
-                        </HorizontalStack>
+        <div className="attempts-div" key={props.index}>
+            <div className="row-div-1" key={props.index}>
+                <HorizontalStack gap={1}>
+                    <span className="api-text">
+                        Vulnerable endpoint:
+                    </span>
+                    <span className="url-text">
+                        {props.testingRun.apiInfoKey.url}
+                    </span>
+                </HorizontalStack>
+                <HorizontalStack>
+                    <Box paddingInlineEnd={4}>
+                        <span className="api-text">
+                            Collection name: {" "}
+                        </span>
+                        <span className="url-text">
+                            {props.collectionsMap[props.testingRun.apiInfoKey.apiCollectionId]}
+                        </span>
+                    </Box>
+                </HorizontalStack>
+            </div>
+            {props.testingRun?.testResults?.map((testRun, index1) => (
+                <div key={index1}>
+                    <div className="row-div">
+                        <span className="title-name" style={{ fontWeight: "500" }}>
+                            Original request
+                        </span>
+                        <span className="url-name" style={{ fontWeight: "500" }}>
+                            Attempt
+                        </span>
+                    </div>
+                    <div className="row-div">
+                        <span className="message" style={{ borderRight: "1px solid #47466A73" }}>
+                            {getTruncatedString(getOriginalCurl(testRun.originalMessage))}
+                        </span>
+                        <span className="message">
+                            {getTruncatedString(getOriginalCurl(testRun.message))}
+                        </span>
+                    </div>
+                    <div className="row-div">
+                        <span className="title-name" style={{ fontWeight: "500" }}>
+                            Original Response
+                        </span>
+                        <span className="url-name" style={{ fontWeight: "500" }}>
+                            Attempt Response
+                        </span>
+                    </div>
+                    <div className="row-div">
+                        <span className="message" style={{ borderRight: "1px solid #47466A73" }}>
+                            {getTruncatedString(getResponse(testRun.originalMessage))}
+                        </span>
+                        <span className="message">
+                            {getTruncatedString(getResponse(testRun.message))}
+                        </span>
                     </div>
-                    {testingRun?.testResults?.map((testRun, index1) => (
-                        <div key={index1}>
-                            <div className="row-div">
-                                <span className="title-name" style={{fontWeight: "500"}}>
-                                    Original request
-                                </span>
-                                <span className="url-name" style={{fontWeight: "500"}}>
-                                    Attempt
-                                </span>
-                            </div>
-                            <div className="row-div">
-                                <span className="message" style={{borderRight: "1px solid #47466A73"}}>
-                                    { getTruncatedString(getOriginalCurl(testRun.originalMessage)) }
-                                </span>
-                                <span className="message">
-                                    { getTruncatedString(getOriginalCurl(testRun.message)) }
-                                </span>
-                            </div>
-                            <div className="row-div">
-                                <span className="title-name" style={{fontWeight: "500"}}>
-                                    Original Response
-                                </span>
-                                <span className="url-name" style={{fontWeight: "500"}}>
-                                    Attempt Response
-                                </span>
-                            </div>
-                            <div className="row-div">
-                                <span className="message" style={{borderRight: "1px solid #47466A73"}}>
-                                    { getTruncatedString(getResponse(testRun.originalMessage)) }
-                                </span>
-                                <span className="message">
-                                    { getTruncatedString(getResponse(testRun.message)) }
-                                </span>
-                            </div>
-                        </div>
-                    ))}
                 </div>
             ))}
-          </LegacyCard.Section>
-        </LegacyCard>
-      </VerticalStack>
+        </div>
+    )
+
+}
+
+function MoreInformationComponent(props) {
+
+    return (
+        <VerticalStack gap={"4"}>
+            <LegacyCard>
+                <LegacyCard.Section>
+                    {
+                        props.sections?.map((section, index) => {
+                            return (<LegacyCard.Subsection key={index}>
+                                <VerticalStack gap="3">
+                                    <HorizontalStack gap="2" align="start" blockAlign='start'>
+                                        <div style={{ maxWidth: "0.875rem", maxHeight: "0.875rem" }}>
+                                            {section?.icon && <Icon source={section.icon}></Icon>}
+                                        </div>
+                                        <Text variant='headingSm'>
+                                            {section.title || "Heading"}
+                                        </Text>
+                                    </HorizontalStack>
+                                    {section.content}
+                                </VerticalStack>
+                            </LegacyCard.Subsection>)
+                        })
+                    }
+                </LegacyCard.Section>
+                <LegacyCard.Section>
+                    {props.item?.category?.vulnerableTestingRunResults?.map((testingRun, index) => (
+                        testingRun.workflowTest ? <VulnerableMultiStepTestDetails
+                            key={index}
+                            index={index}
+                            testingRun={testingRun}
+                            collectionsMap={props.collectionsMap}
+                            dataToCurlObj={props.dataToCurlObj}
+                        /> : <VulnerableEndpointDetails
+                            key={index}
+                            index={index}
+                            testingRun={testingRun}
+                            collectionsMap={props.collectionsMap}
+                            dataToCurlObj={props.dataToCurlObj}
+                        />
+                    ))}
+                </LegacyCard.Section>
+            </LegacyCard>
+        </VerticalStack>
     )
-  }
-  
+}
+
 
 export default ExportHtml
\ No newline at end of file
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/transform.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/transform.js
index d18c9512ce..3d8aea4b1c 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/transform.js
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/transform.js
@@ -343,7 +343,7 @@ const transform = {
 
   fillMoreInformation(category, moreInfoSections, affectedEndpoints, jiraIssueUrl, createJiraTicket) {
     var key = /[^/]*$/.exec(jiraIssueUrl)[0];
-    const jiraComponent = jiraIssueUrl.length > 0 ? (
+    const jiraComponent = jiraIssueUrl?.length > 0 ? (
       <Box>
               <Tag>
                   <HorizontalStack gap={1}>
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/main/App.js b/apps/dashboard/web/polaris_web/web/src/apps/main/App.js
index 5f2ca1b9bc..cc880569f3 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/main/App.js
+++ b/apps/dashboard/web/polaris_web/web/src/apps/main/App.js
@@ -9,8 +9,6 @@ import SensitiveDataExposure from "../dashboard/pages/observe/SensitiveDataExpos
 import SingleRequest from "../dashboard/pages/observe/SingleRequest/SingleRequest";
 import PageObserve from "../dashboard/pages/observe/PageObserve"
 import PageTesting from "../dashboard/pages/testing/PageTesting";
-import { AppProvider } from "@shopify/polaris"
-import SignUp from "../signup/pages/SignUp"
 import {
   createBrowserRouter,
   RouterProvider,
@@ -60,6 +58,7 @@ import HomeDashboard from "../dashboard/pages/dashboard/HomeDashboard";
 import TestLibrary from "../dashboard/pages/settings/test_library/TestLibrary";
 import { useStiggContext } from '@stigg/react-sdk';
 import DependencyTable from "../dashboard/pages/testing/DependencyTable/DependencyTable";
+import SignupPage from "../signup/pages/SignupPage";
 
 // if you add a component in a new path, please verify the search implementation in function -> 'getSearchItemsArr' in func.js
 
@@ -285,13 +284,17 @@ const router = createBrowserRouter([
     ],
     errorElement: <ErrorComponent/>
   },
-{
-  path: "/login",
-    element: <SignUp />,
-},
-{
-  path: "/",
-    element: <Navigate to="/login" />,
+  {
+      path: "/login",
+      element: <SignupPage />,
+  },
+  {
+      path: "/",
+      element: <Navigate to="/login" />,
+  },
+  {
+    path: "/signup",
+    element: <SignupPage />,
   },
 ])
 
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/signup/api.js b/apps/dashboard/web/polaris_web/web/src/apps/signup/api.js
index 2b27f933fb..93e8e1e335 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/signup/api.js
+++ b/apps/dashboard/web/polaris_web/web/src/apps/signup/api.js
@@ -53,5 +53,14 @@ export default {
                 newAccountName
             }
         })
+    },
+    signupUser: function(email, password, invitationCode){
+        return request({
+            url: '/signup-email',
+            method: 'post',
+            data: {
+                email, password, invitationCode
+            }
+        })
     }
 }
\ No newline at end of file
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/signup/components/ProductPreview.jsx b/apps/dashboard/web/polaris_web/web/src/apps/signup/components/ProductPreview.jsx
deleted file mode 100644
index 995a97c76c..0000000000
--- a/apps/dashboard/web/polaris_web/web/src/apps/signup/components/ProductPreview.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { useState } from "react"
-
-import {Box, Text, Icon, HorizontalStack, VerticalStack} from "@shopify/polaris"
-import {ChevronLeftMinor, ChevronRightMinor} from "@shopify/polaris-icons"
-
-import ProductPreviewImages from "../util/productPreviewImages.js"
-
-
-const ProductPreview = () => {
-    const [selectedIndex, setSelectedIndex ] = useState(0)
-  
-    const handleLeftProductPreviewNavigation = () => {
-      if (selectedIndex > 0) {
-          setSelectedIndex(selectedIndex - 1)
-      }
-    }
-  
-    const handleRightProductPreviewNavigation = () => {
-      if (selectedIndex < ProductPreviewImages.length - 1) {
-          setSelectedIndex(selectedIndex + 1)
-      }
-    }
-  
-    return (
-      <Box background="bg-interactive-hover">
-        <div style={{width: "40vw", margin: "25vh auto"}}>
-          <VerticalStack gap="3" align="center">
-            <img src={ProductPreviewImages[selectedIndex]}/>
-            
-            <HorizontalStack gap="3" align="center">
-              <div onClick={handleLeftProductPreviewNavigation}>
-                <Icon
-                  source={ChevronLeftMinor}
-                  color={selectedIndex === 0 ? "base" : "subdued"}
-                /> 
-              </div>  
-              <Text as="h1" color="text-inverse">{selectedIndex + 1} / {ProductPreviewImages.length}</Text>
-              <div onClick={handleRightProductPreviewNavigation}>
-                <Icon
-                  source={ChevronRightMinor}
-                  color={selectedIndex === ProductPreviewImages.length - 1 ? "base" : "subdued"}
-                />      
-              </div>
-            </HorizontalStack>
-          </VerticalStack>
-        </div>
-      </Box>
-    )
-}
-
-export default ProductPreview
\ No newline at end of file
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/signup/components/SSOTextfield.jsx b/apps/dashboard/web/polaris_web/web/src/apps/signup/components/SSOTextfield.jsx
new file mode 100644
index 0000000000..50c4fdde39
--- /dev/null
+++ b/apps/dashboard/web/polaris_web/web/src/apps/signup/components/SSOTextfield.jsx
@@ -0,0 +1,15 @@
+import { Avatar, Button, HorizontalStack, Text } from '@shopify/polaris'
+import React from 'react'
+
+function SSOTextfield({onClickFunc, logo , text}) {
+    return (
+        <Button onClick={onClickFunc}>
+            <HorizontalStack align="center" gap={"3"}>
+                <Avatar size="extraSmall" source={logo} />
+                <Text variant="bodyLg" fontWeight="semibold">{text}</Text>
+            </HorizontalStack>
+        </Button>
+    )
+}
+
+export default SSOTextfield
\ No newline at end of file
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/signup/components/SignUp.jsx b/apps/dashboard/web/polaris_web/web/src/apps/signup/components/SignUp.jsx
new file mode 100644
index 0000000000..65a6a8d484
--- /dev/null
+++ b/apps/dashboard/web/polaris_web/web/src/apps/signup/components/SignUp.jsx
@@ -0,0 +1,185 @@
+import { Avatar, Box, Button, Form, Frame, HorizontalStack, Page, Text, TextField, Toast, VerticalStack } from '@shopify/polaris'
+import React, { useEffect, useState } from 'react'
+import SSOTextfield from './SSOTextfield'
+import PasswordTextField from '../../dashboard/components/layouts/PasswordTextField'
+import { useLocation, useNavigate } from "react-router-dom"
+import api from '../api'
+import func from '@/util/func'
+import "../styles.css"
+
+function SignUp() {
+
+  const location = useLocation()
+
+  const [ssoList, setSsoList] = useState([])
+  const [email, setEmail] = useState("")
+  const [password, setPassword] = useState("")
+  const [loginActive, setLoginActive] = useState(location.pathname.includes("login"))
+  const [loading, setLoading] = useState(false)
+
+  const oktaUrl = window.OKTA_AUTH_URL
+  const azureUrl = window.AZURE_REQUEST_URL
+  const githubId = window.GITHUB_CLIENT_ID
+
+  const githubAuthObj = {
+    logo: '/public/github_icon.svg',
+    text: 'Continue with Github SSO',
+    onClickFunc: () => { window.location.href = ("https://github.com/login/oauth/authorize?client_id=" + githubId); }
+  }
+
+  const azureAuthObj = {
+    logo: '/public/azure_logo.svg',
+    text: 'Continue with Azure SSO',
+    onClickFunc: () => { window.location.href = azureUrl }
+  }
+
+  const oktaAuthObj = {
+    logo: '/public/okta_logo.svg',
+    text: 'Continue with Okta SSO',
+    onClickFunc: () => { window.location.href = oktaUrl }
+  }
+
+  useEffect(() => {
+    let copySsoList = []
+    if (githubId !== undefined && githubId.length > 0) {
+      copySsoList.push(githubAuthObj)
+    }
+
+    if (oktaUrl !== undefined && oktaUrl.length > 0) {
+      copySsoList.push(oktaAuthObj)
+    }
+
+    if (azureUrl !== undefined && azureUrl > 0) {
+      copySsoList.push(azureAuthObj)
+    }
+
+    setSsoList(copySsoList)
+
+    if (window.IS_SAAS && window.IS_SAAS === "true") {
+      window.location.href = "/";
+    }
+  }, [])
+
+  const ssoCard = (
+    ssoList.length === 0 ? null :
+      <VerticalStack gap={5}>
+        {
+          ssoList.map((sso, index) => {
+            return (
+              <VerticalStack gap={5} key={index}>
+                <SSOTextfield onClickFunc={sso.onClickFunc} logo={sso.logo} text={sso.text} />
+                <HorizontalStack gap={3}>
+                  <div style={{ flexGrow: 1, borderBottom: '1px solid #c9cccf' }}></div>
+                  <Text variant="bodySm" color="subdued">or</Text>
+                  <div style={{ flexGrow: 1, borderBottom: '1px solid #c9cccf' }}></div>
+                </HorizontalStack>
+              </VerticalStack>
+            )
+          })
+        }
+      </VerticalStack>
+  )
+
+  const loginFunc = async() => {
+    setLoading(true)
+    if(loginActive){
+      try {
+        await api.login(email, password)
+      } catch {
+        func.setToast(true, true, "Email or password incorrect. Please login again.")
+      }
+    }else{
+      try {
+        api.signupUser(email, password, window.SIGNUP_INVITATION_CODE).then((resp)=> {
+          if (resp && resp.indexOf("<")== -1) {
+            func.setToast(true, true, "Signup error " + resp)
+          }else{
+            navigate('/dashboard/onboarding')
+          }
+        })
+      } catch (error) {
+        func.setToast(true, true, "Signup error " + error)
+      }
+    }
+    setLoading(false)
+  }
+
+  const loginObject = {
+    headingText: "Welcome back",
+    buttonText: "Sign in",
+    linkText: "Sign up",
+    descriptionText: "Need to create a new organization?",
+    targetUrl: '/signup'
+  }
+
+  const signupObject = {
+    headingText: "Create new account",
+    buttonText: "Sign up",
+    linkText: "Sign in",
+    descriptionText: "Already using Akto?",
+    targetUrl: '/login'
+  }
+
+  const activeObject = loginActive ? loginObject : signupObject
+  const navigate = useNavigate()
+
+  const signupEmailCard = (
+    <VerticalStack gap={4}>
+      <Form onSubmit={loginFunc}>
+        <VerticalStack gap={4}>
+          <div className='form-class'>
+            <TextField onChange={setEmail} value={email} label="Email" placeholder="name@workemail.com" monospaced={true}/>
+          </div>
+          <div className='form-class'>
+            <PasswordTextField setField={(val) => setPassword(val)} onFunc={true} field={password} label="Password" monospaced={true}/>
+          </div>
+          <Button fullWidth primary onClick={loginFunc} size="large" loading={loading}>{activeObject.buttonText}</Button>
+        </VerticalStack>
+      </Form>
+      <HorizontalStack align="center" gap={1}>
+        <Text>{activeObject.descriptionText}</Text>
+        <Button plain onClick={() => {setLoginActive(!loginActive); navigate(activeObject.targetUrl)}}>{activeObject.linkText}</Button>
+      </HorizontalStack>
+    </VerticalStack>
+  )
+  return (
+    <div className='login-page'>
+      <Frame >
+        <Page fullWidth >
+          <Box padding="10" paddingBlockStart={"24"}>
+            <div style={{display: "flex", justifyContent: 'space-between', flexDirection: "column"}}>
+              <HorizontalStack align="center">
+                <Box width='400px'>
+                  <VerticalStack gap={8}>
+                    <HorizontalStack align='center'>
+                      <div className="akto-logo">
+                        <Avatar source="/public/akto_name_with_logo.svg" shape="round" size="2xl-experimental" />
+                      </div>
+                    </HorizontalStack>
+                    <VerticalStack gap={8}>
+                      <Text alignment="center" variant="heading2xl">{activeObject.headingText}</Text>
+                      <VerticalStack gap={5}>
+                        {ssoCard}
+                        {signupEmailCard}
+                      </VerticalStack>
+                    </VerticalStack>
+
+                  </VerticalStack>
+                  <div style={{bottom: "40px", position: "absolute", width: '400px'}}>
+                    <HorizontalStack gap={3} align="center">
+                      <Button plain onClick={() => window.open("https://www.akto.io/terms-and-policies","_blank")}>Terms of use</Button>
+                      <div style={{width: '1px', height: '24px', background: "#E1E3E5"}} />
+                      <Button plain onClick={() => window.open("https://www.akto.io/terms/privacy","_blank")}>Privacy policy</Button>
+                    </HorizontalStack>
+                  </div>
+                </Box>
+              </HorizontalStack>
+            </div>
+          </Box>
+        </Page>
+      </Frame>
+    </div>
+  )
+}
+
+export default SignUp
\ No newline at end of file
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/signup/components/SignUpCard.jsx b/apps/dashboard/web/polaris_web/web/src/apps/signup/components/SignUpCard.jsx
deleted file mode 100644
index 00544a4fdf..0000000000
--- a/apps/dashboard/web/polaris_web/web/src/apps/signup/components/SignUpCard.jsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import { useState } from "react"
-import { useNavigate } from "react-router-dom"
-import api from "../api"
-
-import { TextField, Button, Box, Text, HorizontalStack, Divider, VerticalStack, Toast, Frame } from "@shopify/polaris"
-
-import AktoLogo from "../images/akto_logo.png"
-import AktoLogoText from "../images/akto_logo_text.png"
-import GoogleIcon from "../images/google.png"
-import Store from "../../dashboard/store"
-
-const SignUpCard = () => {
-  const [email, setEmail] = useState('')
-  const [password, setPassword] = useState('')
-
-  const toastConfig = Store(state => state.toastConfig)
-  const setToastConfig = Store(state => state.setToastConfig)
-  const storeUsername = Store(state => state.storeUsername)
-
-  const isLocalDeploy = window.DASHBOARD_MODE && window.DASHBOARD_MODE.toLowerCase() === 'local_deploy'
-
-  const setLoginErrorToast = () => {
-      setToastConfig({
-        isActive: true,
-        isError: true,
-        message: "Please, Log in Again"
-      })
-  }
-
-  const disableLoginErrorToast = () => {
-    setToastConfig({
-      isActive: false,
-      isError: false,
-      message: ""
-    })
-  }
-
-  const loginToastMarkup = toastConfig.isActive ? (
-    <Toast content={toastConfig.message} error={toastConfig.isError} onDismiss={disableLoginErrorToast} duration={1500} />
-  ) : null;
-
-  const handleEmailChange = (inputEmail) => {
-    setEmail(inputEmail)
-  }
-
-  const handlePasswordChange = (inputPassword) => {
-    setPassword(inputPassword)
-  }
-
-  const handleContinueWithEmail = async () => {
-    try {
-      await api.login(email, password)
-    } catch {
-      setLoginErrorToast()
-    }
-  }
-
-  return (
-      <Box background="bg">
-        <div style={{ width: "30vw", margin: "10vh auto" }}>
-          <VerticalStack gap="5">
-            <span>
-              <img src={AktoLogo} />
-              <img src={AktoLogoText} style={{ paddingLeft: "5px" }} />
-            </span>
-            <div>
-              <Text variant="headingXl">Getting started</Text>
-              <Text variant="bodyLg">Start free, no credit card required</Text>
-            </div>
-
-            <Divider />
-            <Text variant="bodySm" alignment="center">or</Text>
-            <Divider />
-
-            <TextField
-              id="email"
-              label="Email"
-              type="email"
-              value={email}
-              placeholder="name@workemail.com"
-              onChange={handleEmailChange}
-              autoComplete="email"
-            />
-            <TextField
-              id="password"
-              label="Password"
-              type="password"
-              value={password}
-              placeholder="password"
-              onChange={handlePasswordChange}
-              autoComplete="password"
-            />
-            <Button size="large" fullWidth primary onClick={handleContinueWithEmail} id="continueEmail">Continue with Email</Button>
-
-            <HorizontalStack gap="3" align="end">
-              <Button plain monochrome removeUnderline>Help</Button>
-              <Button plain monochrome removeUnderline>Privacy</Button>
-              <Button plain monochrome removeUnderline>Terms</Button>
-            </HorizontalStack>
-          </VerticalStack>
-          <div style={{width: "0px", height: "0px"}}>
-            <Frame>
-              {loginToastMarkup}
-            </Frame>
-          </div>
-        </div>
-      </Box>
-  )
-}
-
-export default SignUpCard
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/signup/images/akto_logo.png b/apps/dashboard/web/polaris_web/web/src/apps/signup/images/akto_logo.png
deleted file mode 100644
index 1aecd11c4c..0000000000
Binary files a/apps/dashboard/web/polaris_web/web/src/apps/signup/images/akto_logo.png and /dev/null differ
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/signup/images/akto_logo_text.png b/apps/dashboard/web/polaris_web/web/src/apps/signup/images/akto_logo_text.png
deleted file mode 100644
index 301ac2fc8d..0000000000
Binary files a/apps/dashboard/web/polaris_web/web/src/apps/signup/images/akto_logo_text.png and /dev/null differ
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/signup/images/google.png b/apps/dashboard/web/polaris_web/web/src/apps/signup/images/google.png
deleted file mode 100644
index 6545765bda..0000000000
Binary files a/apps/dashboard/web/polaris_web/web/src/apps/signup/images/google.png and /dev/null differ
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/signup/images/product-preview-images/product-preview-1.png b/apps/dashboard/web/polaris_web/web/src/apps/signup/images/product-preview-images/product-preview-1.png
deleted file mode 100644
index f9eeeef542..0000000000
Binary files a/apps/dashboard/web/polaris_web/web/src/apps/signup/images/product-preview-images/product-preview-1.png and /dev/null differ
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/signup/images/product-preview-images/product-preview-2.png b/apps/dashboard/web/polaris_web/web/src/apps/signup/images/product-preview-images/product-preview-2.png
deleted file mode 100644
index ce8b4ab5c7..0000000000
Binary files a/apps/dashboard/web/polaris_web/web/src/apps/signup/images/product-preview-images/product-preview-2.png and /dev/null differ
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/signup/pages/SignUp.jsx b/apps/dashboard/web/polaris_web/web/src/apps/signup/pages/SignUp.jsx
deleted file mode 100644
index bb4f43548f..0000000000
--- a/apps/dashboard/web/polaris_web/web/src/apps/signup/pages/SignUp.jsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import SignUpCard from "../components/SignUpCard"
-import ProductPreview from "../components/ProductPreview"
-import { Frame } from "@shopify/polaris"
-
-const SignUp = () => {
-  return (
-    <div style={{ display: "grid", gridTemplateColumns: "1fr 1.33fr", height: "100vh" }}>
-        <SignUpCard />
-        <ProductPreview />
-    </div>
-  )
-}
-
-export default SignUp
\ No newline at end of file
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/signup/pages/SignupPage.jsx b/apps/dashboard/web/polaris_web/web/src/apps/signup/pages/SignupPage.jsx
new file mode 100644
index 0000000000..f0e9077dc6
--- /dev/null
+++ b/apps/dashboard/web/polaris_web/web/src/apps/signup/pages/SignupPage.jsx
@@ -0,0 +1,36 @@
+import React from 'react'
+import SignUp from "../components/SignUp"
+import { Box, Text, VerticalStack } from '@shopify/polaris'
+
+function SignupPage() {
+
+    const imageStyle = {
+        width: '953px',
+        borderRadius: '12px',
+        border: '6px solid',
+        marginTop: '90px'
+    }
+    return (
+        <div style={{display: 'flex', height: '100vh', overflow: 'hidden'}}>
+            <div style={{flex: '4', overflow: "hidden", boxShadow: "-1px 0px 0px 0px #E4E5E7 inset"}}>
+                <Box paddingBlockStart={"24"} paddingInlineStart={"20"} paddingInlineEnd={"8"}>
+                    <VerticalStack gap="6">
+                        <Text variant="heading3xl" fontWeight="medium">
+                            {`"It's truly a game-changer and we highly recommend Akto to anyone looking to effortlessly secure their API endpoints."`}
+                        </Text>
+                        <Box>
+                            <Text variant="headingLg">— Security team</Text>
+                            <Text fontWeight="medium" color="subdued">Enterprise SaaS customer</Text>
+                        </Box>
+                        <img  src="/public/productss.png" alt='ss' style={{...imageStyle}}/>
+                    </VerticalStack>
+                </Box>
+            </div>
+            <div style={{flex: '3'}}>
+                <SignUp />
+            </div>
+        </div>
+    )
+}
+
+export default SignupPage
\ No newline at end of file
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/signup/styles.css b/apps/dashboard/web/polaris_web/web/src/apps/signup/styles.css
new file mode 100644
index 0000000000..7e91daa3b7
--- /dev/null
+++ b/apps/dashboard/web/polaris_web/web/src/apps/signup/styles.css
@@ -0,0 +1,12 @@
+.akto-logo .Polaris-Avatar__Image{
+    height: unset !important;
+}
+
+.akto-logo .Polaris-Avatar__size2xl--experimental {
+    width: 117px !important;
+    height: 38px !important;
+}
+
+.login-page .Polaris-Frame__Main{
+    background: var(--white) !important;
+}
\ No newline at end of file
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/signup/util/productPreviewImages.js b/apps/dashboard/web/polaris_web/web/src/apps/signup/util/productPreviewImages.js
deleted file mode 100644
index 8c848bb409..0000000000
--- a/apps/dashboard/web/polaris_web/web/src/apps/signup/util/productPreviewImages.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import PP1 from "../images/product-preview-images/product-preview-1.png"
-import PP2 from "../images/product-preview-images/product-preview-2.png"
-
-export default [
-    PP1,
-    PP2,
-]
\ No newline at end of file
diff --git a/apps/dashboard/web/polaris_web/web/src/util/func.js b/apps/dashboard/web/polaris_web/web/src/util/func.js
index ca88abfced..544eab0d7a 100644
--- a/apps/dashboard/web/polaris_web/web/src/util/func.js
+++ b/apps/dashboard/web/polaris_web/web/src/util/func.js
@@ -730,6 +730,7 @@ mergeApiInfoAndApiCollection(listEndpoints, apiInfoList, idToName) {
           }
 
           let authType = apiInfoMap[key] ? apiInfoMap[key]["actualAuthType"].join(", ") : ""
+          let authTypeTag = authType.replace(",", "");
           let score = apiInfoMap[key] ? apiInfoMap[key]?.severityScore : 0
           let isSensitive = apiInfoMap[key] ? apiInfoMap[key]?.isSensitive : false
 
@@ -755,6 +756,7 @@ mergeApiInfoAndApiCollection(listEndpoints, apiInfoList, idToName) {
               apiCollectionName: idToName ? (idToName[x.apiCollectionId] || '-') : '-',
               auth_type: (authType || "").toLowerCase(),
               sensitiveTags: [...this.convertSensitiveTags(x.sensitive)],
+              authTypeTag: (authTypeTag || "").toLowerCase(),
               collectionIds: apiInfoMap[key] ? apiInfoMap[key]?.collectionIds.filter(x => {
                 return Object.keys(apiGroupsMap).includes(x) || Object.keys(apiGroupsMap).includes(x.toString())
               }).map( x => {
diff --git a/apps/dashboard/web/public/logo_google.svg b/apps/dashboard/web/public/logo_google.svg
new file mode 100644
index 0000000000..f919587bcd
--- /dev/null
+++ b/apps/dashboard/web/public/logo_google.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18" aria-hidden="true"><title>Google</title><g fill="none" fill-rule="evenodd"><path fill="#4285F4" d="M17.64 9.2045c0-.6381-.0573-1.2518-.1636-1.8409H9v3.4814h4.8436c-.2086 1.125-.8427 2.0782-1.7959 2.7164v2.2581h2.9087c1.7018-1.5668 2.6836-3.874 2.6836-6.615z"></path><path fill="#34A853" d="M9 18c2.43 0 4.4673-.806 5.9564-2.1805l-2.9087-2.2581c-.8059.54-1.8368.859-3.0477.859-2.344 0-4.3282-1.5831-5.036-3.7104H.9574v2.3318C2.4382 15.9832 5.4818 18 9 18z"></path><path fill="#FBBC05" d="M3.964 10.71c-.18-.54-.2822-1.1168-.2822-1.71s.1023-1.17.2823-1.71V4.9582H.9573A8.9965 8.9965 0 0 0 0 9c0 1.4523.3477 2.8268.9573 4.0418L3.964 10.71z"></path><path fill="#EA4335" d="M9 3.5795c1.3214 0 2.5077.4541 3.4405 1.346l2.5813-2.5814C13.4632.8918 11.426 0 9 0 5.4818 0 2.4382 2.0168.9573 4.9582L3.964 7.29C4.6718 5.1627 6.6559 3.5795 9 3.5795z"></path></g></svg>
diff --git a/apps/dashboard/web/public/productss.png b/apps/dashboard/web/public/productss.png
new file mode 100644
index 0000000000..ab02ae4083
Binary files /dev/null and b/apps/dashboard/web/public/productss.png differ
diff --git a/apps/testing/src/main/java/com/akto/testing/Main.java b/apps/testing/src/main/java/com/akto/testing/Main.java
index 39f8c6c25f..ff45c8d27d 100644
--- a/apps/testing/src/main/java/com/akto/testing/Main.java
+++ b/apps/testing/src/main/java/com/akto/testing/Main.java
@@ -28,6 +28,8 @@
 import com.akto.util.EmailAccountName;
 import com.mongodb.ConnectionString;
 import com.mongodb.client.model.Filters;
+import com.mongodb.client.model.FindOneAndUpdateOptions;
+import com.mongodb.client.model.ReturnDocument;
 import com.mongodb.client.model.Updates;
 import org.bson.conversions.Bson;
 import org.bson.types.ObjectId;
@@ -50,27 +52,20 @@ public class Main {
     public static final boolean SKIP_SSRF_CHECK = "true".equalsIgnoreCase(System.getenv("SKIP_SSRF_CHECK"));
     public static final boolean IS_SAAS = "true".equalsIgnoreCase(System.getenv("IS_SAAS"));
 
-    private static ObjectId createTRRSummaryIfAbsent(TestingRun testingRun, int start){
-        ObjectId summaryId = new ObjectId();
-        try {
-            ObjectId testingRunId = new ObjectId(testingRun.getHexId());
-            TestingRunResultSummary testingRunResultSummary = TestingRunResultSummariesDao.instance.findOne(
+    private static TestingRunResultSummary createTRRSummaryIfAbsent(TestingRun testingRun, int start){
+        ObjectId testingRunId = new ObjectId(testingRun.getHexId());
+
+        return TestingRunResultSummariesDao.instance.getMCollection().findOneAndUpdate(
                 Filters.and(
-                    Filters.eq(TestingRunResultSummary.TESTING_RUN_ID, testingRunId),
-                    Filters.eq(TestingRunResultSummary.STATE,TestingRun.State.SCHEDULED)
-                )
-            );
-            summaryId = testingRunResultSummary.getId();
-            TestingRunResultSummariesDao.instance.updateOne(
-                    Filters.eq(TestingRunResultSummary.ID, summaryId),
-                    Updates.set(TestingRunResultSummary.STATE, TestingRun.State.RUNNING));
-        } catch (Exception e){
-            TestingRunResultSummary summary = new TestingRunResultSummary(start, 0, new HashMap<>(),
-            0, testingRun.getId(), testingRun.getId().toHexString(), 0, 0);
-
-            summaryId = TestingRunResultSummariesDao.instance.insertOne(summary).getInsertedId().asObjectId().getValue();
-        }
-        return summaryId;
+                        Filters.eq(TestingRunResultSummary.TESTING_RUN_ID, testingRunId),
+                        Filters.eq(TestingRunResultSummary.STATE,TestingRun.State.SCHEDULED)
+                ),
+                Updates.combine(
+                        Updates.set(TestingRunResultSummary.STATE, TestingRun.State.RUNNING),
+                        Updates.setOnInsert(TestingRunResultSummary.START_TIMESTAMP, start)
+                ),
+                new FindOneAndUpdateOptions().upsert(true).returnDocument(ReturnDocument.AFTER)
+        );
     }
 
     private static void setupRateLimitWatcher () {
@@ -104,7 +99,7 @@ private static TestingRun findPendingTestingRun() {
         );
         Bson filter2 = Filters.and(
                 Filters.eq(TestingRun.STATE, TestingRun.State.RUNNING),
-                Filters.lte(TestingRun.SCHEDULE_TIMESTAMP, delta)
+                Filters.lte(TestingRun.PICKED_UP_TIMESTAMP, delta)
         );
 
         Bson update = Updates.combine(
@@ -112,21 +107,24 @@ private static TestingRun findPendingTestingRun() {
                 Updates.set(TestingRun.STATE, TestingRun.State.RUNNING)
         );
 
+        // returns the previous state of testing run before the update
         return TestingRunDao.instance.getMCollection().findOneAndUpdate(
                 Filters.or(filter1,filter2), update);
     }
 
     private static TestingRunResultSummary findPendingTestingRunResultSummary() {
-        int delta = Context.now() - 20*60;
+        int now = Context.now();
+        int delta = now - 20*60;
 
         Bson filter1 = Filters.and(
             Filters.eq(TestingRun.STATE, TestingRun.State.SCHEDULED),
-            Filters.lte(TestingRunResultSummary.START_TIMESTAMP, Context.now()),
+            Filters.lte(TestingRunResultSummary.START_TIMESTAMP, now),
             Filters.gt(TestingRunResultSummary.START_TIMESTAMP, delta)
         );
 
         Bson filter2 = Filters.and(
             Filters.eq(TestingRun.STATE, TestingRun.State.RUNNING),
+            Filters.lte(TestingRunResultSummary.START_TIMESTAMP, now - 5*60),
             Filters.gt(TestingRunResultSummary.START_TIMESTAMP, delta)
         );
 
@@ -196,6 +194,7 @@ public static void main(String[] args) throws InterruptedException {
                 int start = Context.now();
 
                 TestingRunResultSummary trrs = findPendingTestingRunResultSummary();
+                boolean isSummaryRunning = trrs != null && trrs.getState().equals(State.RUNNING);
                 TestingRun testingRun;
                 ObjectId summaryId = null;
                 if (trrs == null) {
@@ -209,6 +208,8 @@ public static void main(String[] args) throws InterruptedException {
                     return;
                 }
 
+                boolean isTestingRunRunning = testingRun.getState().equals(State.RUNNING);
+
                 int accountId = account.getId();
                 if (UsageMetricUtils.checkTestRunsOverage(accountId)) {
                     int lastSent = logSentMap.getOrDefault(accountId, 0);
@@ -231,10 +232,10 @@ public static void main(String[] args) throws InterruptedException {
                 try {
                     setTestingRunConfig(testingRun, trrs);
 
-                    if (summaryId == null) {
-                        if (testingRun.getState().equals(TestingRun.State.RUNNING)) {
-                            Map<ObjectId, TestingRunResultSummary> objectIdTestingRunResultSummaryMap = TestingRunResultSummariesDao.instance.fetchLatestTestingRunResultSummaries(Collections.singletonList(testingRun.getId()));
-                            TestingRunResultSummary testingRunResultSummary = objectIdTestingRunResultSummaryMap.get(testingRun.getId());
+                    if (isSummaryRunning || isTestingRunRunning) {
+                        Map<ObjectId, TestingRunResultSummary> objectIdTestingRunResultSummaryMap = TestingRunResultSummariesDao.instance.fetchLatestTestingRunResultSummaries(Collections.singletonList(testingRun.getId()));
+                        TestingRunResultSummary testingRunResultSummary = objectIdTestingRunResultSummaryMap.get(testingRun.getId());
+                        if (testingRunResultSummary != null) {
                             List<TestingRunResult> testingRunResults = TestingRunResultDao.instance.fetchLatestTestingRunResult(Filters.eq(TestingRunResult.TEST_RUN_RESULT_SUMMARY_ID, testingRunResultSummary.getId()), 1);
                             if (testingRunResults != null && !testingRunResults.isEmpty()) {
                                 TestingRunResult testingRunResult = testingRunResults.get(0);
@@ -245,22 +246,57 @@ public static void main(String[] args) throws InterruptedException {
                                 } else {
                                     loggerMaker.infoAndAddToDb("Test run was executed long ago, TRR_ID:"
                                             + testingRunResult.getHexId() + ", TRRS_ID:" + testingRunResultSummary.getHexId() + " TR_ID:" + testingRun.getHexId(), LogDb.TESTING);
-                                    TestingRunResultSummariesDao.instance.updateOne(Filters.eq(TestingRunResultSummary.ID, testingRunResultSummary.getId()), Updates.set(TestingRunResultSummary.STATE, TestingRun.State.FAILED));
+                                    TestingRunResultSummary summary = TestingRunResultSummariesDao.instance.updateOneNoUpsert(
+                                            Filters.and(
+                                                    Filters.eq(TestingRunResultSummary.ID, testingRunResultSummary.getId()),
+                                                    Filters.eq(TestingRunResultSummary.STATE, State.RUNNING)
+                                            ),
+                                            Updates.set(TestingRunResultSummary.STATE, State.FAILED)
+                                    );
+                                    if (summary == null) {
+                                        loggerMaker.infoAndAddToDb("Skipping because some other thread picked it up, TRRS_ID:" + testingRunResultSummary.getHexId() + " TR_ID:" + testingRun.getHexId(), LogDb.TESTING);
+                                        return;
+                                    }
+
                                     TestingRunResultSummary runResultSummary = TestingRunResultSummariesDao.instance.findOne(Filters.eq(TestingRunResultSummary.ID, testingRunResultSummary.getId()));
                                     GithubUtils.publishGithubComments(runResultSummary);
                                 }
                             } else {
                                 loggerMaker.infoAndAddToDb("No executions made for this test, will need to restart it, TRRS_ID:" + testingRunResultSummary.getHexId() + " TR_ID:" + testingRun.getHexId(), LogDb.TESTING);
-                                TestingRunResultSummariesDao.instance.updateOne(Filters.eq(TestingRunResultSummary.ID, testingRunResultSummary.getId()), Updates.set(TestingRunResultSummary.STATE, TestingRun.State.FAILED));
-                                TestingRunResultSummary runResultSummary = TestingRunResultSummariesDao.instance.findOne(Filters.eq(TestingRunResultSummary.ID, testingRunResultSummary.getId()));
-                                GithubUtils.publishGithubComments(runResultSummary);
+                                TestingRunResultSummary summary = TestingRunResultSummariesDao.instance.updateOneNoUpsert(
+                                        Filters.and(
+                                                Filters.eq(TestingRunResultSummary.ID, testingRunResultSummary.getId()),
+                                                Filters.eq(TestingRunResultSummary.STATE, State.RUNNING)
+                                        ),
+                                        Updates.set(TestingRunResultSummary.STATE, State.FAILED)
+                                );
+                                if (summary == null) {
+                                    loggerMaker.infoAndAddToDb("Skipping because some other thread picked it up, TRRS_ID:" + testingRunResultSummary.getHexId() + " TR_ID:" + testingRun.getHexId(), LogDb.TESTING);
+                                    return;
+                                }
+                            }
+
+                            // insert new summary based on old summary
+                            if (summaryId != null) {
+                                trrs.setId(new ObjectId());
+                                trrs.setStartTimestamp(start);
+                                trrs.setState(State.RUNNING);
+                                TestingRunResultSummariesDao.instance.insertOne(trrs);
+                                summaryId = trrs.getId();
+                            } else {
+                                trrs = createTRRSummaryIfAbsent(testingRun, start);
+                                summaryId = trrs.getId();
                             }
                         }
+                    }
 
-                        summaryId = createTRRSummaryIfAbsent(testingRun, start);
+                    if (summaryId == null) {
+                        trrs = createTRRSummaryIfAbsent(testingRun, start);
+                        summaryId = trrs.getId();
                     }
+
                     TestExecutor testExecutor = new TestExecutor();
-                    if (trrs != null && trrs.getState() == State.SCHEDULED) {
+                    if (trrs.getState() == State.SCHEDULED) {
                         if (trrs.getMetadata()!= null && trrs.getMetadata().containsKey("pull_request_id") && trrs.getMetadata().containsKey("commit_sha_head") ) {
                             //case of github status push
                             GithubUtils.publishGithubStatus(trrs);
@@ -270,7 +306,7 @@ public static void main(String[] args) throws InterruptedException {
                     testExecutor.init(testingRun, summaryId);
                     raiseMixpanelEvent(summaryId, testingRun);
                 } catch (Exception e) {
-                    loggerMaker.errorAndAddToDb("Error in init " + e, LogDb.TESTING);
+                    loggerMaker.errorAndAddToDb(e, "Error in init " + e);
                 }
                 Bson completedUpdate = Updates.combine(
                         Updates.set(TestingRun.STATE, TestingRun.State.COMPLETED),