diff --git a/frontend/src/components/Branding.jsx b/frontend/src/components/Branding.jsx
index 649c509a..40a76846 100644
--- a/frontend/src/components/Branding.jsx
+++ b/frontend/src/components/Branding.jsx
@@ -39,7 +39,7 @@ const Branding = (props) => {
 	const theme = getTheme(themeMode, brandColor)
 	const [selectedBrandColor, setSelectedBrandColor] = useState(theme?.palette?.main || "#FF8544")
 	const [selectedBrandName, setSelectedBrandName] = useState(selectedOrganization?.branding?.brand_name || "")
-    const isCloud = window.location.host === "localhost:3002" || window.location.host === "shuffler.io";
+
 	const [isLoading,setIsLoading] = useState(false);
 
 	const handleEditOrg = (joinStatus) => {
@@ -391,7 +391,7 @@ const Branding = (props) => {
 				</div>
 
 
-				{ integrationPartner ? (
+				{integrationPartner ? (
 					<>
 					<Divider style={{marginTop: 50, marginBottom: 50, color: theme.palette.defaultBorder}} />
 					<Typography style={{fontSize: 24, fontWeight: "bold"}}>
@@ -414,9 +414,6 @@ const Branding = (props) => {
 								if (changingTheme === true) {
 									return
 								}
-
-								
-								toast.info("Changing theme to " + newTheme + ". Please wait a moment.")
 								setChangingTheme(true)
 								handleEditOrg(newTheme);
 							}}
diff --git a/frontend/src/components/LeftSideBar.jsx b/frontend/src/components/LeftSideBar.jsx
index 2d9bad44..69a9b29e 100644
--- a/frontend/src/components/LeftSideBar.jsx
+++ b/frontend/src/components/LeftSideBar.jsx
@@ -403,7 +403,6 @@ const LeftSideBar = ({ userdata, serverside, globalUrl, notifications, }) => {
 
   const handleChangeTheme = (newTheme) => {
 
-    toast.info("Changing theme to " + newTheme + " - please wait!");
 
     const data = {
       	  "org_id": userdata?.active_org?.id,
@@ -449,6 +448,38 @@ const LeftSideBar = ({ userdata, serverside, globalUrl, notifications, }) => {
             });
   };
 
+  
+  const handleUpdateTheme = (newTheme) => {
+    
+    const data = {
+      "user_id": userdata?.id,
+      "theme": newTheme,
+    }
+
+    const url = globalUrl + `/api/v1/users/updateuser`;
+    fetch(url, {
+      mode: "cors",
+      method: "PUT",
+      body: JSON.stringify(data),
+      credentials: "include",
+      crossDomain: true,
+      withCredentials: true,
+      headers: {
+        "Content-Type": "application/json; charset=utf-8",
+      },
+    }).then((response) =>
+      response.json().then((responseJson) => {
+        if (responseJson["success"] === false) {
+          toast("Failed updating theme: ", responseJson.reason);
+        } else {
+          handleThemeChange(newTheme);
+          setCurrentSelectedTheme(newTheme);
+        }
+      })
+    ).catch((error) => {
+      console.log("Error changing theme: ", error);
+    }); 
+  };
     
 
   const removeCookie = (name, path = "/") => {
@@ -487,6 +518,7 @@ const LeftSideBar = ({ userdata, serverside, globalUrl, notifications, }) => {
         console.error("Logout error:", error);
       });
   };
+  console.log("userdata: ", userdata);
   const avatarMenu = (
     <span>
       <IconButton
@@ -543,7 +575,7 @@ const LeftSideBar = ({ userdata, serverside, globalUrl, notifications, }) => {
           },
         }}
       >
-        {userdata && (
+        {userdata && (userdata?.org_status?.includes("integration_partner") && userdata?.org_status?.includes("sub_org")) ? null : (
           <>
             <ToggleButtonGroup
       value={currentSelectedTheme}
@@ -555,7 +587,11 @@ const LeftSideBar = ({ userdata, serverside, globalUrl, notifications, }) => {
         if (newTheme === currentSelectedTheme) {
           return;
         }
-        handleChangeTheme(newTheme);
+        if (userdata?.org_status?.includes("integration_partner")){
+            handleChangeTheme(newTheme);
+        }else {
+          handleUpdateTheme(newTheme);
+        }
       }}
       aria-label="theme"
       style={{display: 'flex', justifyContent: "center", marginBottom: 10,  }}
@@ -1648,7 +1684,7 @@ const LeftSideBar = ({ userdata, serverside, globalUrl, notifications, }) => {
 
           <Button
             component={Link}
-            to={isCloud ? "/admin?admin_tab=billingstats" : "/admin?admin_tab=locations"}
+            to={isCloud ? "/admin" : "/admin"}
             onClick={(event) => {
               setCurrentOpenTab("admin");
               localStorage.setItem("lastTabOpenByUser", "admin");
@@ -2070,4 +2106,4 @@ const ModalView = memo(({searchBarModalOpen, setSearchBarModalOpen, globalUrl, s
       </Dialog>
     )
   )
-});
\ No newline at end of file
+});
diff --git a/frontend/src/components/Priorities.jsx b/frontend/src/components/Priorities.jsx
index e8d83016..5755574f 100644
--- a/frontend/src/components/Priorities.jsx
+++ b/frontend/src/components/Priorities.jsx
@@ -1,27 +1,38 @@
-import React, { useState, useEffect, useContext, memo } from "react";
+import React, { useState, useEffect, useContext, memo, useCallback } from "react";
 import { toast } from "react-toastify";
 import { getTheme } from "../theme.jsx";
 import { v4 as uuidv4, v5 as uuidv5, validate as isUUID, } from "uuid";
 import {
 	Paper,
 	Tooltip,
-  	Typography,
+	Typography,
 	Divider,
 	Button,
 	ButtonGroup,
 	Grid,
 	Card,
-	Chip,
-  	Switch,
+	Switch,
 	Autocomplete,
 	TextField,
 	MenuItem,
 	IconButton,
+	Dialog,
+	FormControl,
+	DialogContent,
+	DialogActions,
+	DialogTitle,
+	InputLabel,
 	Box,
+	Select
 } from "@mui/material";
 
+import AuthenticationData from "../components/AuthenticationWindow.jsx";
+import Stack from "@mui/material/Stack";
+import Chip from "@mui/material/Chip";
+
 import {
 	OpenInNew as OpenInNewIcon,
+	Info as InfoIcon,
 } from "@mui/icons-material";
 
 import { makeStyles } from "@mui/styles";
@@ -40,20 +51,20 @@ const useStyles = makeStyles({
 });
 
 const Priorities = memo((props) => {
-  const { globalUrl, userdata,clickedFromOrgTab,selectedOrganization, handleEditOrg, serverside, billingInfo, stripeKey, checkLogin, setAdminTab, setCurTab, notifications, setNotifications, } = props;
-  const { themeMode, brandColor } = useContext(Context);
-  const theme = getTheme(themeMode, brandColor);
-  const [showDismissed, setShowDismissed] = React.useState(false);
-  const [showRead, setShowRead] = React.useState(false);
-  const [appFramework, setAppFramework] = React.useState({});
-  const [selectedWorkflow, setSelectedWorkflow] = React.useState("NO HIGHLIGHT");
-  const [selectedExecutionId, setSelectedExecutionId] = React.useState("NO HIGHLIGHT");
-  const [highlightKMS, setHighlightKMS] = React.useState(false)
+	const { globalUrl, userdata, clickedFromOrgTab, selectedOrganization, handleEditOrg, serverside, billingInfo, stripeKey, checkLogin, setAdminTab, setCurTab, notifications, setNotifications, } = props;
+	const { themeMode, brandColor } = useContext(Context);
+	const theme = getTheme(themeMode, brandColor);
+	const [showDismissed, setShowDismissed] = React.useState(false);
+	const [showRead, setShowRead] = React.useState(false);
+	const [appFramework, setAppFramework] = React.useState({});
+	const [selectedWorkflow, setSelectedWorkflow] = React.useState("NO HIGHLIGHT");
+	const [selectedExecutionId, setSelectedExecutionId] = React.useState("NO HIGHLIGHT");
+	const [highlightKMS, setHighlightKMS] = React.useState(false)
 
-  const [workflows, setWorkflows] = React.useState([])
-  const [openNotification, setOpenNotification] = React.useState(false);
-  const [workflow, setWorkflow] = React.useState({})
-  const [notificationWorkflow, setNotificationWorkflow] = React.useState(
+	const [workflows, setWorkflows] = React.useState([])
+	const [openNotification, setOpenNotification] = React.useState(false);
+	const [workflow, setWorkflow] = React.useState({})
+	const [notificationWorkflow, setNotificationWorkflow] = React.useState(
 		selectedOrganization.defaults === undefined
 			? ""
 			: selectedOrganization.defaults.notification_workflow === undefined ||
@@ -61,10 +72,1140 @@ const Priorities = memo((props) => {
 				? ""
 				: selectedOrganization.defaults.notification_workflow
 	);
-  
-  let navigate = useNavigate();
+
+
+	//  notification workflow
+	const [notificationWorkflowModal, setNotificationWorkflowModal] = React.useState(false);
+	const [selectedAppDetails, setSelectedAppDetails] = React.useState({});
+	const [notificationWorkflowTestModal, setNotificationWorkflowTestModal] = React.useState(false);
+	const [selectedAuth, setSelectedAuth] = React.useState('');
+	const [emailData, setEmailData] = React.useState([]);
+	const [notificationAppsDetails, setnotificationAppsDetails] = React.useState({});
+	const [generatedWorkflow, setGeneatedWorkflow] = React.useState({});
+
+	// for jira & email modal
+	const [textFieldValue, setTextFieldValue] = React.useState("");
+	const [textFieldOneValue, setTextFieldOneValue] = React.useState("");
+
+	useEffect(() => {
+		prepareNotificationAppList()
+	}, []);
+
+	let navigate = useNavigate();
 	const classes = useStyles();
 
+	const getAppIDs = async (appList) => {
+		fetch(globalUrl + "/api/v1/apps", {
+			method: "GET",
+			headers: {
+				"Content-Type": "application/json",
+				Accept: "application/json",
+			},
+			credentials: "include",
+		}).then((response) => {
+			if (response.status !== 200) {
+				toast("Failed getting app ids: ", response.reason);
+				console.log("Status not 200 for app ids :O!");
+				return;
+			}
+			return response.json();
+		}).then((responseJson) => {
+			if (responseJson !== undefined) {
+				// console.log("App ids: ", responseJson)
+				// console.log("App list: ", appList)
+				const filteredApps = responseJson.filter(app => appList.includes(app.name));
+				const appDetails = filteredApps.map(app => ({ name: app.name, id: app.id }));
+				return appDetails
+				// console.log("App IDs: ", appDetails)
+			}
+		}).catch((error) => {
+			console.log("Error getting app ids: " + error);
+		})
+	}
+
+	// getting comms & cases app from app framework
+	var notificationAppList = [];
+	// if (selectedOrganization.security_framework?.cases && selectedOrganization.security_framework?.cases.name.length > 0) {
+	// 	notificationAppList = notificationAppList.concat(selectedOrganization.security_framework?.cases);
+	// }
+	// if (selectedOrganization.security_framework?.communication && selectedOrganization.security_framework?.communication.name.length > 0) {
+	// 	notificationAppList = notificationAppList.concat(selectedOrganization.security_framework?.communication);
+	// }
+
+	const mergeAuthData = (result, responseJson) => {
+		// result is only getting: Jira AND discord.
+
+		const updatedResult = result.map(item => {
+			const matches = responseJson.filter(authItem => (authItem.app.name === item.name)
+			);
+			return {
+				...item,
+				authentication_data: matches.length > 0 ? matches : null
+			};
+		});
+		return updatedResult;
+	};
+
+	const prepareNotificationAppList = async () => {
+		// getting App ID,Authentication fields and saved auths for each app
+		var result = []
+		fetch(globalUrl + "/api/v1/apps", {
+			method: "GET",
+			headers: {
+				"Content-Type": "application/json",
+				Accept: "application/json",
+			},
+			credentials: "include",
+		}).then((response) => {
+			if (response.status !== 200) {
+				toast("Failed getting app ids: ", response.reason);
+				console.log("Status not 200 for app ids :O!");
+				return;
+			}
+			return response.json();
+		}).then((responseJson) => {
+			if (responseJson !== undefined) {
+				const filteredApps = responseJson.filter(app => app.categories?.includes("Communication") || app.categories?.includes("Cases"));
+				const emailData = responseJson.filter(app => app.name === "email")
+				setEmailData(emailData)
+				const appDetails = filteredApps.map(app => ({ name: app.name, id: app.id })); //mapped apps with IDs as sometime Ids were not correct in security framework
+				// console.log("appDetails: ", appDetails)
+				// result = appDetails
+
+				fetch(globalUrl + "/api/v1/apps/authentication", {
+					method: "GET",
+					headers: {
+						"Content-Type": "application/json",
+						Accept: "application/json",
+					},
+					credentials: "include",
+				})
+					.then((response) => {
+						if (response.status !== 200) {
+							toast(`Failed getting auth for : `, response.reason);
+							console.log("Status not 200 for app auth :O!");
+							return;
+						}
+						return response.json();
+					}).then(async (responseJson) => {
+						if (!responseJson.success) {
+							console.log("Could not get app auth")
+							return;
+						}
+						// console.log("responseJson of auth: ", responseJson.data)
+						result = await mergeAuthData(appDetails, responseJson.data)
+						// console.log("merged auth data: ", result)
+						// console.log("result", result)
+
+						result.map(item => {
+							console.log("Getting app config for: ", item.name);
+							fetch(globalUrl + `/api/v1/apps/${item.id}/config`, {
+								method: "GET",
+								headers: {
+									"Content-Type": "application/json",
+									Accept: "application/json",
+								},
+								credentials: "include",
+							}).then((response) => {
+								if (response.status !== 200) {
+									toast(`Failed getting config for ${item.id}: `, response.reason);
+									console.log("Status not 200 for app config :O!");
+									return;
+								}
+								return response.json();
+							}).then((responseJson) => {
+								if (!responseJson.success) {
+									console.log("Could not get app config")
+									return;
+								}
+								var decodedString = JSON.parse(atob(responseJson.app));
+
+								// why is auth_config appearing like this? 
+								// this is not very clean.	
+								item.auth_config = decodedString.authentication
+								item.large_image = decodedString.large_image
+								item.categories = decodedString.categories
+
+								let newJSON = notificationAppList;
+
+								console.log("item: ", item)
+
+								// keeping state changes to a minimum
+								if ((newJSON[item.name] === undefined) && (item?.authentication_data !== null)) {
+									newJSON[item.name] = item;
+									setnotificationAppsDetails(newJSON);
+									console.log("notificationAppsDetails: ", newJSON)
+								}
+							}).then(async () => {
+								// removing this for now,
+								// await checkIfAlreadyGenerated(filteredApps, workflows);
+
+							}).catch((error) => {
+								console.log("Error getting app config: " + error);
+								toast("Error getting app config: " + error);
+							})
+						})
+					})
+			}
+		}).catch((error) => {
+			console.log("Error getting app ids: " + error);
+		})
+	}
+
+
+	const executeTestWorkflow = async (workflowid) => {
+		const data = { "execution_argument": '{"title":"THIS IS TEST ALERT","description":"TEST ALERT FROM SHUFFLE","reference_url": "shuffler.io"}' }
+		fetch(globalUrl + `/api/v1/workflows/${workflowid}/execute`, {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+				Accept: "application/json",
+			},
+			body: JSON.stringify(data),
+			credentials: "include",
+		})
+			.then((response) => {
+				if (response.status !== 200) {
+					toast("Failed setting notification workflow: ", response.reason);
+					console.log("Status not 200 for workflows :O!");
+					return;
+				}
+				toast("Notification workflow ran successfully");
+				return response.json();
+			}).catch((error) => {
+				console.log("Error getting workflows: " + error);
+			})
+	}
+
+	useEffect(() => {
+		console.log("Apps: ", notificationAppsDetails);
+	}, [notificationAppsDetails])
+
+	// const generateJiraNotificationWorkflow = async (app, appAuthId, projectId, issuetype) => {
+	// 	//currently only supports JIRA figure out a way to support more apps
+
+	// 	var appname = app.name;
+	// 	var appImage = app.large_image;
+
+	// 	var workflowName = `[GENERATED] ${appname} notification workflow`
+	// 	var workflowDescription = "Generated by Shuffle for sending info/error notifications."
+	// 	var data = {
+	// 		"name": workflowName,
+	// 		"description": workflowDescription,
+	// 	}
+
+	// 	fetch(globalUrl + "/api/v1/workflows", {
+	// 		method: "POST",
+	// 		headers: {
+	// 			"Content-Type": "application/json",
+	// 			Accept: "application/json",
+	// 		},
+	// 		body: JSON.stringify(data),
+	// 		credentials: "include",
+	// 	})
+	// 		.then((response) => {
+	// 			if (response.status !== 200) {
+	// 				toast("Failed setting notification workflow: ", response.reason);
+	// 				console.log("Status not 200 for workflows :O!");
+	// 				return;
+	// 			}
+	// 			return response.json();
+	// 		}).then((responseJson) => {
+	// 			if (responseJson !== undefined) {
+	// 				console.log("Notification workflow created successfully")
+	// 				var workflow_id = responseJson.id
+	// 				if (appname.toLowerCase() === "jira") {
+	// 					console.log("updating workflow for JIRA")
+	// 					var workflowBody = {
+	// 						"name": workflowName,
+	// 						"Description": workflowDescription,
+	// 						"id": workflow_id,
+	// 						"actions": [
+	// 							{
+	// 								"app_id": app.id,
+	// 								"app_name": "jira",
+	// 								"name": "post_create_issue",
+	// 								"authentication_id": appAuthId,
+	// 								"large_image": appImage,
+	// 								"isStartNode": true,
+	// 								"label": "create_issue",
+	// 								"app_version": "1.1.0",
+	// 								"parameters": [
+	// 									{
+	// 										"name": "body",
+	// 										"value": `{"fields": { "project": {"key": "${projectId}"},"summary": "$exec.title","issuetype": {"name": "${issuetype}"},"description": {"content": [{"content":[{"type":"text","text":"$exec.description"}],"type": "paragraph"}],"type": "doc","version": 1}}}`
+	// 									},
+	// 									{
+	// 										"name": "username_basic",
+	// 										"value": ""
+	// 									},
+	// 									{
+	// 										"name": "password_basic",
+	// 										"value": ""
+	// 									},
+	// 									{
+	// 										"name": "url",
+	// 										"value": ""
+	// 									},
+	// 									{
+	// 										"name": "headers",
+	// 										"value": "Content-type=application/json \nAccept=application/json"
+	// 									},
+	// 									{
+	// 										"name": "queries",
+	// 										"value": ""
+	// 									},
+	// 									{
+	// 										"name": "ssl_verify",
+	// 										"value": "False"
+	// 									}
+	// 								]
+	// 							}
+	// 						]
+	// 					}
+	// 				}
+	// 				fetch(globalUrl + `/api/v1/workflows/${workflow_id}`, {
+	// 					method: "PUT",
+	// 					headers: {
+	// 						"Content-Type": "application/json",
+	// 						Accept: "application/json",
+	// 					},
+	// 					body: JSON.stringify(workflowBody),
+	// 					credentials: "include",
+	// 				})
+	// 					.then((response) => {
+	// 						if (response.status !== 200) {
+	// 							toast("Failed setting notification workflow: ", response.reason);
+	// 							console.log("Status not 200 for workflows :O!");
+	// 							return;
+	// 						}
+	// 						return response.json();
+	// 					}).then((responseJson) => {
+	// 						if (responseJson !== undefined) {
+	// 							handleEditOrg(
+	// 								selectedOrganization.name,
+	// 								selectedOrganization.description,
+	// 								selectedOrganization.id,
+	// 								selectedOrganization.image,
+	// 								{
+	// 									documentation_reference: selectedOrganization?.defaults?.documentation_reference,
+	// 									workflow_upload_repo: selectedOrganization?.defaults?.workflow_upload_repo,
+	// 									workflow_upload_branch: selectedOrganization?.defaults?.workflow_upload_branch,
+	// 									workflow_upload_username: selectedOrganization?.defaults?.workflow_upload_username,
+	// 									workflow_upload_token: selectedOrganization?.defaults?.workflow_upload_token,
+	// 									newsletter: selectedOrganization?.defaults?.newsletter,
+	// 									weekly_recommendations: selectedOrganization?.defaults?.weekly_recommendations,
+	// 									notification_workflow: workflow_id,
+	// 								},
+	// 								{
+	// 									sso_entrypoint: selectedOrganization?.sso_config?.sso_entrypoint,
+	// 									sso_certificate: selectedOrganization?.sso_config?.sso_certificate,
+	// 									client_id: selectedOrganization?.sso_config?.client_id,
+	// 									client_secret: selectedOrganization?.sso_config?.client_secret,
+	// 									openid_authorization: selectedOrganization?.sso_config?.openid_authorization,
+	// 									openid_token: selectedOrganization?.sso_config?.openid_token,
+	// 									SSORequired: selectedOrganization?.sso_config?.SSORequired,
+	// 									auto_provision: selectedOrganization?.sso_config?.auto_provision,
+	// 								}
+	// 							)
+	// 							console.log("Notification workflow updated successfully")
+	// 							toast("Notification workflow updated successfully")
+	// 						}
+	// 					})
+	// 			}
+	// 		}).catch((error) => {
+	// 			console.log("Error setting workflows: " + error);
+	// 		})
+	// }
+
+	const generateCommsNotificationWorkflow = async (app, sender, recepient) => {
+		var appname = app.name
+		var appImage = app.large_image
+
+		//currently only supports  figure out a way to support more apps
+		var workflowName = `[GENERATED] ${appname} notification workflow`
+		var workflowDescription = "Generated by Shuffle for sending info/error notifications."
+		var data = {
+			"name": workflowName,
+			"description": workflowDescription,
+		}
+
+		fetch(globalUrl + "/api/v1/workflows", {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+				Accept: "application/json",
+			},
+			body: JSON.stringify(data),
+			credentials: "include",
+		})
+			.then((response) => {
+				if (response.status !== 200) {
+					toast("Failed setting notification workflow: ", response.reason);
+					console.log("Status not 200 for workflows :O!");
+					return;
+				}
+				return response.json();
+			}).then((responseJson) => {
+				toast("Trying to create notification workflow..")
+				if (responseJson !== undefined) {
+					console.log("Notification workflow created successfully")
+
+					var commsParameter = [
+						{
+							"key": "recipient",
+							"value": recepient
+						},
+						{
+							"key": "sender",
+							"value": sender
+						},
+						{
+							"key": "subject",
+							"value": "$exec.title"
+						},
+						{
+							"key": "body",
+							"value": "$exec.description"
+						}
+					]
+
+					if (app.name.toLowerCase() === "gmail") {
+						// this is a special case and we know it
+						commsParameter = `[
+{
+"key": "content",
+"value": {% python %}
+import base64
+
+# Set your email variables
+sender = "${sender}"
+recipient = "${recepient}"
+subject = "$exec.title"
+body = "$exec.description"
+
+raw_email = f"""FROM: {sender}\\nTO: {recipient}\\nsubject: {subject}\\n{body}"""
+
+# Encode for Gmail API
+encoded = base64.urlsafe_b64encode(raw_email.encode()).decode()
+
+print('"' + encoded + '"')
+{% endpython %}, 
+},
+{
+"key": "userId",
+"value": "me"
+}]`
+					}
+
+					var workflow_id = responseJson.id;
+
+
+					var commsAction = {
+						"app_name": "Singul",
+						"app_version": "1.0.0",
+						"description": "Available actions for communication",
+						"app_id": "integration",
+						"errors": [],
+						"is_valid": true,
+						"isStartNode": true,
+						"label": "Send Notification Message",
+						"public": false,
+						"generated": false,
+						"large_image": app.large_image,
+						"environment": "Cloud",
+						"name": "Communication",
+						"parameters": [
+							{
+								"description": "",
+								"id": "",
+								"name": "action",
+								"example": "",
+								"value": "send_message",
+								"multiline": false,
+								"multiselect": false,
+								"options": [
+									"list_messages",
+									"get_message",
+									"send_message",
+									"search_messages",
+									"list_attachments",
+									"get_attachment",
+									"create_contact",
+									"get_contact"
+								],
+								"action_field": "",
+								"variant": "",
+								"required": true,
+								"configuration": false,
+								"tags": null,
+								"schema": {
+									"type": ""
+								},
+								"skip_multicheck": false,
+								"value_replace": null,
+								"unique_toggled": false,
+								"error": "",
+								"hidden": false
+							},
+							{
+								"description": "",
+								"id": "",
+								"name": "fields",
+								"example": "",
+								"value": `${commsParameter}`,
+								"multiline": true,
+								"multiselect": false,
+								"options": null,
+								"action_field": "",
+								"variant": "",
+								"required": false,
+								"configuration": false,
+								"tags": null,
+								"schema": {
+									"type": ""
+								},
+								"skip_multicheck": false,
+								"value_replace": null,
+								"unique_toggled": false,
+								"error": "",
+								"hidden": false
+							},
+							{
+								"description": "",
+								"id": "",
+								"name": "app_name",
+								"example": "",
+								"value": app.name,
+								"multiline": false,
+								"multiselect": false,
+								"options": null,
+								"action_field": "",
+								"variant": "",
+								"required": false,
+								"configuration": false,
+								"tags": null,
+								"schema": {
+									"type": ""
+								},
+								"skip_multicheck": false,
+								"value_replace": null,
+								"unique_toggled": false,
+								"error": "",
+								"hidden": false
+							}
+						],
+						"execution_variable": {
+							"description": "",
+							"id": "",
+							"name": "",
+							"value": ""
+						},
+						"position": {
+							"x": 67.96428571428578,
+							"y": 263.14385714285714
+						},
+						"authentication_id": "",
+						"category": "",
+						"reference_url": "",
+						"sub_action": false,
+						"run_magic_output": false,
+						"run_magic_input": false,
+						"execution_delay": 0,
+						"category_label": null,
+						"suggestion": false,
+						"parent_controlled": false,
+						"source_workflow": "",
+						"source_execution": ""
+					}
+
+					console.log("updating workflow for email")
+					var workflowBody = {
+						"name": workflowName,
+						"Description": workflowDescription,
+						"id": workflow_id,
+						"actions": [
+							commsAction,
+						]
+					}
+
+					fetch(globalUrl + `/api/v1/workflows/${workflow_id}`, {
+						method: "PUT",
+						headers: {
+							"Content-Type": "application/json",
+							Accept: "application/json",
+						},
+						body: JSON.stringify(workflowBody),
+						credentials: "include",
+					})
+						.then((response) => {
+							if (response.status !== 200) {
+								toast("Failed setting notification workflow: ", response.reason);
+								console.log("Status not 200 for workflows :O!");
+								return;
+							}
+							return response.json();
+						}).then((responseJson) => {
+							if (responseJson !== undefined) {
+								toast("Saving as notification workflow now..")
+								handleEditOrg(
+									selectedOrganization.name,
+									selectedOrganization.description,
+									selectedOrganization.id,
+									selectedOrganization.image,
+									{
+										documentation_reference: selectedOrganization?.defaults?.documentation_reference,
+										workflow_upload_repo: selectedOrganization?.defaults?.workflow_upload_repo,
+										workflow_upload_branch: selectedOrganization?.defaults?.workflow_upload_branch,
+										workflow_upload_username: selectedOrganization?.defaults?.workflow_upload_username,
+										workflow_upload_token: selectedOrganization?.defaults?.workflow_upload_token,
+										newsletter: selectedOrganization?.defaults?.newsletter,
+										weekly_recommendations: selectedOrganization?.defaults?.weekly_recommendations,
+										notification_workflow: workflow_id,
+									},
+									{
+										sso_entrypoint: selectedOrganization?.sso_config?.sso_entrypoint,
+										sso_certificate: selectedOrganization?.sso_config?.sso_certificate,
+										client_id: selectedOrganization?.sso_config?.client_id,
+										client_secret: selectedOrganization?.sso_config?.client_secret,
+										openid_authorization: selectedOrganization?.sso_config?.openid_authorization,
+										openid_token: selectedOrganization?.sso_config?.openid_token,
+										SSORequired: selectedOrganization?.sso_config?.SSORequired,
+										auto_provision: selectedOrganization?.sso_config?.auto_provision,
+									}
+								)
+
+								console.log("Notification workflow updated successfully")
+								toast("Notification workflow updated successfully")
+							}
+						})
+				}
+			}).catch((error) => {
+				console.log("Error setting workflows: " + error);
+			})
+	}
+
+	const generateCasesNotificationWorkflow = async (app, projectId) => {
+		var appname = app.name
+		var appImage = app.large_image
+
+		//currently only supports  figure out a way to support more apps
+		var workflowName = `[GENERATED] ${appname} notification workflow`
+		var workflowDescription = "Generated by Shuffle for sending info/error notifications."
+		var data = {
+			"name": workflowName,
+			"description": workflowDescription,
+		}
+
+		fetch(globalUrl + "/api/v1/workflows", {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+				Accept: "application/json",
+			},
+			body: JSON.stringify(data),
+			credentials: "include",
+		})
+			.then((response) => {
+				if (response.status !== 200) {
+					toast("Failed setting notification workflow: ", response.reason);
+					console.log("Status not 200 for workflows :O!");
+					return;
+				}
+				return response.json();
+			}).then((responseJson) => {
+				toast("Trying to create notification workflow..")
+				if (responseJson !== undefined) {
+					console.log("Notification workflow created successfully")
+
+					var ticketParameter = [
+						{
+							"key": "project",
+							"value": projectId,
+						},
+						{
+							"key": "content",
+							"value": "$exec.title"
+						},
+						{
+							"key": "title",
+							"value": "$exec.description"
+						}
+					]
+
+					// fields = fields.concat(otherFields)
+
+					var workflow_id = responseJson.id;
+
+					var commsAction = {
+						"app_name": "Singul",
+						"app_version": "1.0.0",
+						"description": "Available actions for case management",
+						"app_id": "integration",
+						"errors": [
+
+						],
+						"is_valid": true,
+						"isStartNode": true,
+						"label": "create_case_from_notification",
+						"public": false,
+						"generated": false,
+						"large_image": app.large_image,
+						"environment": "Cloud",
+						"name": "Cases",
+						"parameters": [
+							{
+								"description": "",
+								"id": "",
+								"name": "action",
+								"example": "",
+								"value": "create_ticket",
+								"multiline": false,
+								"multiselect": false,
+								"options": [
+									"list_tickets",
+									"get_ticket",
+									"create_ticket",
+									"close_ticket",
+									"add_comment",
+									"update_ticket",
+									"search_tickets"
+								],
+								"action_field": "",
+								"variant": "",
+								"required": true,
+								"configuration": false,
+								"tags": null,
+								"schema": {
+									"type": ""
+								},
+								"skip_multicheck": false,
+								"value_replace": null,
+								"unique_toggled": false,
+								"error": "",
+								"hidden": false
+							},
+							{
+								"description": "",
+								"id": "",
+								"name": "fields",
+								"example": "",
+								"value": ticketParameter,
+								"multiline": true,
+								"multiselect": false,
+								"options": null,
+								"action_field": "",
+								"variant": "",
+								"required": false,
+								"configuration": false,
+								"tags": null,
+								"schema": {
+									"type": ""
+								},
+								"skip_multicheck": false,
+								"value_replace": null,
+								"unique_toggled": false,
+								"error": "",
+								"hidden": false
+							},
+							{
+								"description": "",
+								"id": "",
+								"name": "app_name",
+								"example": "",
+								"value": app.name,
+								"multiline": false,
+								"multiselect": false,
+								"options": null,
+								"action_field": "",
+								"variant": "",
+								"required": false,
+								"configuration": false,
+								"tags": null,
+								"schema": {
+									"type": ""
+								},
+								"skip_multicheck": false,
+								"value_replace": null,
+								"unique_toggled": false,
+								"error": "",
+								"hidden": false
+							}
+						],
+						"execution_variable": {
+							"description": "",
+							"id": "",
+							"name": "",
+							"value": ""
+						},
+						"position": {
+							"x": -111.59751960534861,
+							"y": 180.34429863506278
+						},
+						"authentication_id": "",
+						"category": "",
+						"reference_url": "",
+						"sub_action": false,
+						"run_magic_output": false,
+						"run_magic_input": false,
+						"execution_delay": 0,
+						"category_label": null,
+						"suggestion": false,
+						"parent_controlled": false,
+						"source_workflow": "",
+						"source_execution": ""
+					}
+
+					console.log("updating workflow for email")
+					var workflowBody = {
+						"name": workflowName,
+						"Description": workflowDescription,
+						"id": workflow_id,
+						"actions": [
+							commsAction,
+						]
+					}
+
+					fetch(globalUrl + `/api/v1/workflows/${workflow_id}`, {
+						method: "PUT",
+						headers: {
+							"Content-Type": "application/json",
+							Accept: "application/json",
+						},
+						body: JSON.stringify(workflowBody),
+						credentials: "include",
+					})
+						.then((response) => {
+							if (response.status !== 200) {
+								toast("Failed setting notification workflow: ", response.reason);
+								console.log("Status not 200 for workflows :O!");
+								return;
+							}
+							return response.json();
+						}).then((responseJson) => {
+							if (responseJson !== undefined) {
+								handleEditOrg(
+									selectedOrganization.name,
+									selectedOrganization.description,
+									selectedOrganization.id,
+									selectedOrganization.image,
+									{
+										documentation_reference: selectedOrganization?.defaults?.documentation_reference,
+										workflow_upload_repo: selectedOrganization?.defaults?.workflow_upload_repo,
+										workflow_upload_branch: selectedOrganization?.defaults?.workflow_upload_branch,
+										workflow_upload_username: selectedOrganization?.defaults?.workflow_upload_username,
+										workflow_upload_token: selectedOrganization?.defaults?.workflow_upload_token,
+										newsletter: selectedOrganization?.defaults?.newsletter,
+										weekly_recommendations: selectedOrganization?.defaults?.weekly_recommendations,
+										notification_workflow: workflow_id,
+									},
+									{
+										sso_entrypoint: selectedOrganization?.sso_config?.sso_entrypoint,
+										sso_certificate: selectedOrganization?.sso_config?.sso_certificate,
+										client_id: selectedOrganization?.sso_config?.client_id,
+										client_secret: selectedOrganization?.sso_config?.client_secret,
+										openid_authorization: selectedOrganization?.sso_config?.openid_authorization,
+										openid_token: selectedOrganization?.sso_config?.openid_token,
+										SSORequired: selectedOrganization?.sso_config?.SSORequired,
+										auto_provision: selectedOrganization?.sso_config?.auto_provision,
+									}
+								)
+
+								console.log("Notification workflow updated successfully")
+								toast("Notification workflow updated successfully")
+							}
+						})
+				}
+			}).catch((error) => {
+				console.log("Error setting workflows: " + error);
+			})
+	}
+
+	const testWorkflowModal = notificationWorkflowTestModal ?
+		(<Dialog
+			open={notificationWorkflowTestModal}
+			PaperProps={{
+				style: {
+					backgroundColor: theme.palette.surfaceColor,
+					color: "white",
+					minWidth: 500,
+				},
+			}}
+			onClose={() => {
+				setNotificationWorkflowTestModal(false);
+			}}
+		>
+			<FormControl>
+				{/* <DialogTitle>
+		  <div style={{ color: "rgba(255,255,255,0.9)" }}>
+			Notification workflow
+		  </div>
+		</DialogTitle> */}
+				<DialogContent style={{ color: "rgba(255,255,255,0.65)" }}>
+					We have updated the Notification workflow. Do you want to test it?
+				</DialogContent>
+				<DialogActions>
+					<Button
+						style={{ borderRadius: "0px" }}
+						onClick={() => {
+							setNotificationWorkflowTestModal(false);
+						}}
+						color="primary"
+					>
+						No
+					</Button>
+					<Button
+						variant="contained"
+						style={{ borderRadius: "0px" }}
+						onClick={() => {
+							executeTestWorkflow(selectedOrganization.defaults.notification_workflow);
+							setNotificationWorkflowTestModal(false);
+						}}
+						color="primary"
+					>
+						Yes
+					</Button>
+				</DialogActions>
+			</FormControl>
+		</Dialog>) : null
+
+	const modalView = notificationWorkflowModal ? (
+		<Dialog
+			open={notificationWorkflowModal}
+			PaperProps={{
+				style: {
+					backgroundColor: theme.palette.grey,
+					minWidth: 500,
+				},
+			}}
+			onClose={() => {
+				setNotificationWorkflowModal(false);
+			}}
+		>
+			<FormControl>
+				<DialogTitle>
+					<div style={{ color: "rgba(255,255,255,0.9)" }}>
+						{`Configure ${selectedAppDetails.name} workflow`}
+					</div>
+				</DialogTitle>
+				<DialogContent style={{ color: "rgba(255,255,255,0.65)", overflowY: 'auto', maxHeight: '450px' }}>
+					<Divider style={{ marginBottom: '1em', backgroundColor: 'rgba(255,255,255,0.12)' }} />
+					{console.log("len Selected app details: ", selectedAppDetails)}
+					{(selectedAppDetails.authentication_data || (selectedAppDetails.auth_config && selectedAppDetails.auth_config.required == false) || (selectedAppDetails.authentication && selectedAppDetails.authentication.required == false)) ?
+						<>
+							<Box mb={2}>
+								{true || (selectedAppDetails.auth_config && selectedAppDetails.auth_config.required == false || (selectedAppDetails.authentication && selectedAppDetails.authentication.required == false)) ? "No authentication required" :
+									<>
+										<Typography variant="body1" style={{ marginBottom: '0.5rem' }}>
+											Pick an authentication method from the list
+										</Typography>
+										<FormControl fullWidth style={{ marginBottom: 10 }}>
+											<InputLabel id="demo-simple-select-label">Available authentications</InputLabel>
+											<Select
+												labelId="demo-simple-select-label"
+												id="demo-simple-select"
+												value={selectedAuth}
+												disabled={(selectedAppDetails.auth_config && selectedAppDetails.auth_config.required == false || (selectedAppDetails.authentication && selectedAppDetails.authentication.required == false))}
+												onChange={(event) => {
+													setSelectedAuth(event.target.value)
+													console.log("event.target.value: ", event.target.value)
+													console.log("Selected auth: ", selectedAuth)
+												}}
+												label="Available authentications"
+												required={true}
+											>
+												{(selectedAppDetails.auth_config && selectedAppDetails.auth_config.required == false || (selectedAppDetails.authentication && selectedAppDetails.authentication.required == false)) ? "No authentication required" : selectedAppDetails.authentication_data.map((option) => (
+													<MenuItem key={option.id} value={option.id}>
+														<div style={{ display: 'flex', alignItems: 'center', gap: '10px' }}>
+															<Chip label={option.app.app_version} variant="outlined" />
+															{option.label}
+														</div>
+													</MenuItem>))}
+											</Select>
+										</FormControl></>}
+							</Box>
+							<Box mt={2}>
+								<Typography variant="body1">
+									Provide additional required details:
+								</Typography>
+								<TextField
+									required
+									style={{
+										flex: "1",
+										marginTop: "5px",
+										marginRight: "15px",
+										backgroundColor: theme.palette.inputColor,
+									}}
+									fullWidth={true}
+									type="name"
+									id="outlined-with-placeholder"
+									margin="normal"
+									variant="outlined"
+									placeholder={selectedAppDetails.categories?.includes("Cases") ? "Project key" : "Sender"}
+									// value={webhookInputValue}
+									onChange={(e) => {
+										setTextFieldOneValue(e.target.value)
+									}}
+									InputProps={{
+										classes: {
+											notchedOutline: classes.notchedOutline,
+										},
+										style: {
+											color: "white",
+										},
+									}} />
+								<TextField
+									required
+									style={{
+										flex: "1",
+										marginTop: "5px",
+										marginRight: "15px",
+										backgroundColor: theme.palette.inputColor,
+									}}
+									fullWidth={true}
+									type="name"
+									id="outlined-with-placeholder"
+									margin="normal"
+									variant="outlined"
+									placeholder={selectedAppDetails.categories?.includes("Cases") ? "Issue type" : "Recepient"}
+									// value={webhookInputValue}
+									onChange={(e) => {
+										setTextFieldValue(e.target.value)
+									}}
+									InputProps={{
+										classes: {
+											notchedOutline: classes.notchedOutline,
+										},
+										style: {
+											color: "white",
+										},
+									}} />
+							</Box>
+						</> :
+						<>
+							<AuthenticationData
+								app={selectedAppDetails}
+								// globalUrl={globalUrl}
+								authenticationModalOpen={(selectedAppDetails.authentication_data && selectedAppDetails.authentication_data.length > 0) ? false : true}
+								// // setAuthenticationModalOpen={false}
+								selectedApp={{ ...selectedAppDetails, authentication: selectedAppDetails.auth_config }}
+							// getAppAuthentication={selectedAppDetails.name}
+							/>
+						</>
+					}
+				</DialogContent>
+				<DialogActions>
+					<Button
+						style={{ borderRadius: "0px" }}
+						onClick={() => {
+							setNotificationWorkflowModal(false);
+						}}
+						color="primary"
+					>
+						Cancel
+					</Button>
+					<Button
+						variant="contained"
+						style={{ borderRadius: "0px" }}
+						// disabled={(authOptions.length > 0 ? false : true) || !notificationWorkflowModalValid}
+						onClick={async () => {
+							// var workflowUpdate = await setTeamsWorkflow(webhookInputValue)
+							console.log("Selectedappdetails: ", selectedAppDetails)
+							selectedAppDetails.categories?.includes("Cases") ? generateCasesNotificationWorkflow(selectedAppDetails, textFieldValue)
+								: generateCommsNotificationWorkflow(selectedAppDetails, textFieldOneValue, textFieldValue)
+							setNotificationWorkflowModal(false);
+						}}
+						color="primary"
+					>
+						Submit
+					</Button>
+				</DialogActions>
+			</FormControl>
+		</Dialog >
+	) : null
+
+
+	const checkIfAlreadyGenerated = async (appList, workflows) => { // fixxxxxxxxxxxxxxxxxxxxx	
+
+		var workflowName = workflows.find(workflow => workflow.id === notificationWorkflow)
+		if (workflowName) {
+			workflowName = workflowName.name
+		}
+		else {
+			console.log("no workflow set")
+			return
+		}
+		if (workflowName) {
+			const parts = workflowName.split(' ');
+			console.log("parts", parts)
+			if (parts[0].toString() === "[GENERATED]" && parts.length > 1) {
+				console.log("parts1", parts[1])
+				if ((appList.includes(parts[1]))) {
+					console.log("workflow already generated")
+					setGeneatedWorkflow({ "app_name": parts[1] })
+				}
+			}
+		}
+		else {
+			return
+		}
+	}
+
+	const renderChips = useCallback(() => {
+		const appList = Object.values(notificationAppsDetails);
+		return (
+			<Stack spacing={2}>
+				<Stack direction="row" spacing={1}>
+					{appList.map((app) => (
+						<Chip
+							key={app.id}
+							label={app.name}
+							variant={generatedWorkflow.app_name === app.name ? "filled" : "outlined"}
+							disabled={generatedWorkflow.app_name === app.name ? true : false}
+							onClick={() => {
+								console.log(`Clicked ${app.name}`)
+								console.log("app: ", app)
+								setSelectedAppDetails(app)
+								if (app.authentication_data && app.authentication_data.length > 0) { //fixxxxxxxx
+									console.log("authdata: ", app.authentication_data[0])
+									setSelectedAuth(app.authentication_data[app.authentication_data.length - 1].id)
+								}
+								setNotificationWorkflowModal(true)
+								// getAppAuth(app.name)
+								console.log("selectedAppDEtails", selectedAppDetails)
+							}}
+							avatar={<img src={app.large_image} alt={app.name} style={{ width: 24, height: 24, borderRadius: '50%' }} />}
+						/>
+					))}
+				</Stack>
+
+				<Box sx={{
+					mt: 2,
+					p: 2,
+					backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+					borderRadius: 1,
+					border: "1px solid black",
+				}}>
+					<Typography variant="body2" color="text.secondary" sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
+						<InfoIcon fontSize="small" color="primary" />
+						Want access to more templates?
+						<Link
+							to="/admin?tab=app_auth"
+							style={{
+								color: theme.palette.linkColor,
+								textDecoration: 'none',
+								fontWeight: 500,
+							}}
+						>
+							Set up app authentication
+						</Link>
+						to unlock additional workflow options.
+					</Typography>
+				</Box>
+			</Stack>
+		);
+	}, [notificationAppsDetails])
+
 	useEffect(() => {
 		getFramework()
 
@@ -83,7 +1224,7 @@ const Priorities = memo((props) => {
 			setSelectedExecutionId(execution_id)
 
 			//toast.info("Execution-related notifications are highlighted.")
-		} 
+		}
 
 		if (workflow !== null) {
 			setSelectedWorkflow(workflow)
@@ -97,7 +1238,7 @@ const Priorities = memo((props) => {
 			return
 		}
 
-		if(workflows?.length === 0) {
+		if (workflows?.length === 0) {
 			getAvailableWorkflows()
 		}
 
@@ -107,7 +1248,7 @@ const Priorities = memo((props) => {
 	}, [selectedOrganization])
 
 	if (userdata === undefined || userdata === null) {
-		return 
+		return
 	}
 
 	const getFramework = () => {
@@ -119,67 +1260,67 @@ const Priorities = memo((props) => {
 			},
 			credentials: "include",
 		})
-		.then((response) => {
-			if (response.status !== 200) {
-				console.log("Status not 200 for framework!");
-			}
-
-			return response.json();
-		})
-		.then((responseJson) => {
-			if (responseJson.success === false) {
-				setAppFramework({})
-				if (responseJson.reason !== undefined) {
-					//toast("Failed loading: " + responseJson.reason)
-				} else {
-					//toast("Failed to load framework for your org.")
+			.then((response) => {
+				if (response.status !== 200) {
+					console.log("Status not 200 for framework!");
 				}
-			} else {
-				setAppFramework(responseJson)
-			}
-		})
-		.catch((error) => {
-			console.log("err in framework: ", error.toString());
-		})
+
+				return response.json();
+			})
+			.then((responseJson) => {
+				if (responseJson.success === false) {
+					setAppFramework({})
+					if (responseJson.reason !== undefined) {
+						//toast("Failed loading: " + responseJson.reason)
+					} else {
+						//toast("Failed to load framework for your org.")
+					}
+				} else {
+					setAppFramework(responseJson)
+				}
+			})
+			.catch((error) => {
+				console.log("err in framework: ", error.toString());
+			})
 	}
 
-    const clearNotifications = () => {
-      // Don't really care about the logout
+	const clearNotifications = () => {
+		// Don't really care about the logout
 
-      toast("Clearing notifications")
-      fetch(`${globalUrl}/api/v1/notifications/clear`, {
-        credentials: "include",
-        method: "GET",
-        headers: {
-          "Content-Type": "application/json",
-        },
-      })
-        .then(function (response) {
-          if (response.status !== 200) {
-            console.log("Error in response");
-          }
+		toast("Clearing notifications")
+		fetch(`${globalUrl}/api/v1/notifications/clear`, {
+			credentials: "include",
+			method: "GET",
+			headers: {
+				"Content-Type": "application/json",
+			},
+		})
+			.then(function (response) {
+				if (response.status !== 200) {
+					console.log("Error in response");
+				}
 
-          return response.json();
-        })
-        .then(function (responseJson) {
-          if (responseJson.success === true) {
-			  // Reload the UI
-			  const newNotifications = notifications.map((notification) => {
-				  notification.read = true
-				  return notification
-			  })
+				return response.json();
+			})
+			.then(function (responseJson) {
+				if (responseJson.success === true) {
+					// Reload the UI
+					const newNotifications = notifications.map((notification) => {
+						notification.read = true
+						return notification
+					})
 
-			  setNotifications(newNotifications)
-			  setShowRead(true)
-          } else {
-            toast("Failed dismissing notifications. Please try again later.");
-          }
-        })
-        .catch((error) => {
-          console.log("error in notification dismissal: ", error);
-          //removeCookie("session_token", {path: "/"})
-        });
-    };
+					setNotifications(newNotifications)
+					setShowRead(true)
+				} else {
+					toast("Failed dismissing notifications. Please try again later.");
+				}
+			})
+			.catch((error) => {
+				console.log("error in notification dismissal: ", error);
+				//removeCookie("session_token", {path: "/"})
+			});
+	};
 
 	const dismissNotification = (alert_id, disabled) => {
 		var notificationurl = `${globalUrl}/api/v1/notifications/${alert_id}/markasread`
@@ -189,82 +1330,82 @@ const Priorities = memo((props) => {
 			notificationurl += "?disabled=false"
 		}
 
-    	fetch(notificationurl , {
-    	  credentials: "include",
-    	  method: "GET",
-    	  headers: {
-    	    "Content-Type": "application/json",
-    	  },
-    	})
-	    .then(function (response) {
-	      if (response.status !== 200) {
-	        console.log("Error in response");
-	      }
-
-	      return response.json();
-	    })
-	    .then(function (responseJson) {
-	      if (responseJson.success === true) {
-			// Mark current one as read
-			var newNotifications = notifications.map((notification) => {
-				if (notification.id === alert_id) {
-					notification.read = true
+		fetch(notificationurl, {
+			credentials: "include",
+			method: "GET",
+			headers: {
+				"Content-Type": "application/json",
+			},
+		})
+			.then(function (response) {
+				if (response.status !== 200) {
+					console.log("Error in response");
 				}
 
-				return notification
+				return response.json();
 			})
+			.then(function (responseJson) {
+				if (responseJson.success === true) {
+					// Mark current one as read
+					var newNotifications = notifications.map((notification) => {
+						if (notification.id === alert_id) {
+							notification.read = true
+						}
+
+						return notification
+					})
 
 
-			if (disabled === true) {
-				toast("Notification disabled, and will not be shown again.")
+					if (disabled === true) {
+						toast("Notification disabled, and will not be shown again.")
 
-				newNotifications = newNotifications.map((notification) => {
-					if (notification.id === alert_id) {
-						notification.ignored = true
+						newNotifications = newNotifications.map((notification) => {
+							if (notification.id === alert_id) {
+								notification.ignored = true
+							}
+
+							return notification
+						})
+
+						console.log("NEW NOTIFICATIONS: ", newNotifications);
+					} else if (disabled === false) {
+						toast("Notification re-enabled successfully")
+
+						newNotifications = newNotifications.map((notification) => {
+							if (notification.id === alert_id) {
+								notification.ignored = false
+							}
+
+							return notification
+						})
+
+					} else {
+						toast("Notification dismissed successfully")
 					}
 
-					return notification
-				})
+					//const newNotifications = notifications.filter(
+					//	(data) => data.id !== alert_id
+					//)
 
-				console.log("NEW NOTIFICATIONS: ", newNotifications);
-			} else if (disabled === false) {
-				toast("Notification re-enabled successfully")
+					//console.log("NEW NOTIFICATIONS: ", newNotifications);
 
-				newNotifications = newNotifications.map((notification) => {
-					if (notification.id === alert_id) {
-						notification.ignored = false
+					if (setNotifications !== undefined && newNotifications !== undefined) {
+						setNotifications(newNotifications)
 					}
-
-					return notification
-				})
-
-			} else {
-				toast("Notification dismissed successfully")
-			}
-
-	        //const newNotifications = notifications.filter(
-	      	//	(data) => data.id !== alert_id
-	        //)
-
-	        //console.log("NEW NOTIFICATIONS: ", newNotifications);
-
-			if (setNotifications !== undefined && newNotifications !== undefined) {
-	        	setNotifications(newNotifications)
-			}
-	      } else {
-	        toast("Failed dismissing notification. Please try again later.");
-	      }
-		})
-	    .catch((error) => {
-	      console.log("error in notification dismissal: ", error);
-	      //removeCookie("session_token", {path: "/"})
-	    })
+				} else {
+					toast("Failed dismissing notification. Please try again later.");
+				}
+			})
+			.catch((error) => {
+				console.log("error in notification dismissal: ", error);
+				//removeCookie("session_token", {path: "/"})
+			})
 	}
-  	
 
-	const notificationWidth = "100%" 
+
+	const notificationWidth = "100%"
 	const imagesize = 22
-  	const boxColor = "#86c142"
+	const boxColor = "#86c142"
 
 
 	const getAvailableWorkflows = () => {
@@ -354,134 +1495,168 @@ const Priorities = memo((props) => {
 	}
 
 	return (
-		<div style={{width: "100%", height: "100%", boxSizing: 'border-box', transition: 'width 0.3s ease', padding: clickedFromOrgTab ? "27px 10px 19px 27px":null, height: clickedFromOrgTab ? "auto":null, minHeight: 843, backgroundColor: clickedFromOrgTab ? theme.palette.platformColor :null, borderRadius: clickedFromOrgTab ? '16px':null,  }}>
-		  <div style={{ maxHeight: 1700,  overflowY: "auto", width: '100%', scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin'}}>
-			<div style={{maxWidth: "calc(100% - 20px)"}}>
-		  	<Typography variant="h5" style={{  fontSize: 24, fontWeight: 500, textAlign: "left" }}>
-			  Notification Workflow
-			</Typography>
-			<Typography color="textSecondary" style={{ fontSize: 16, fontWeight: 400, marginTop: 5,  }}>
-				The notification workflow triggers when an error occurs in one of your workflows. Each individual one will only start a workflow once every 2 minutes. <b>You can point child org notifications into the parent org notification by choosing it in the list.</b>
-			</Typography>
-	
-			<div style={{ display: "flex", flexDirection: "row", alignItems: "center", }}>
+		<div style={{ width: "100%", height: "100%", boxSizing: 'border-box', transition: 'width 0.3s ease', padding: clickedFromOrgTab ? "27px 10px 19px 27px" : null, height: clickedFromOrgTab ? "auto" : null, minHeight: 843, backgroundColor: clickedFromOrgTab ? theme.palette.platformColor : null, borderRadius: clickedFromOrgTab ? '16px' : null, }}>
+			<div style={{ maxHeight: 1700, overflowY: "auto", width: '100%', scrollbarColor: theme.palette.scrollbarColorTransparent, scrollbarWidth: 'thin' }}>
+				<div style={{ maxWidth: "calc(100% - 20px)" }}>
+					<Typography variant="h5" style={{ fontSize: 24, fontWeight: 500, textAlign: "left" }}>
+						Notification Workflow
+					</Typography>
+					<Typography color="textSecondary" style={{ fontSize: 16, fontWeight: 400, marginTop: 5, }}>
+						The notification workflow triggers when an error occurs in one of your workflows. Each individual one will only start a workflow once every 2 minutes. <b>You can point child org notifications into the parent org notification by choosing it in the list.</b>
+					</Typography>
 
-			{workflows !== undefined && workflows !== null && workflows.length > 0 ?
-				<Autocomplete
-					id="notification_workflow_search"
-					autoHighlight
-					open={openNotification}
-					onOpen={() => {
-						setOpenNotification(true);
-					}}
-					onClose={() => {
-						setOpenNotification(false);
-					}}
-					freeSolo
-					//autoSelect
-					value={workflows?.find(w => w.id === notificationWorkflow) || null}
-					classes={{ inputRoot: classes.inputRoot }}
-					ListboxProps={{
-						style: {
-							backgroundColor: theme.palette.surfaceColor,
-							color: theme.palette.text.primary,
-							borderRadius: theme.palette.borderRadius,
-						},
-					}}
-					getOptionLabel={(option) => {
-						if (
-							option === undefined ||
-							option === null ||
-							option.name === undefined ||
-							option.name === null
-						) {
-							return "No Workflow Selected";
-						}
+					{modalView}
+					{/*{testWorkflowModal} */}
+					<div style={{ marginBottom: '10px', marginTop: 20, }}>
+						{renderChips()}
+					</div>
 
-						const newname = (
-							option.name.charAt(0).toUpperCase() + option.name.substring(1)
-						).replaceAll("_", " ");
-						return newname;
-					}}
-					options={workflows}
-					fullWidth
-					style={{
-						backgroundColor: theme.palette.textFieldStyle.backgroundColor,
-						borderRadius: theme.palette.textFieldStyle.borderRadius,
-						color: theme.palette.textFieldStyle.color,
-						height: 35,
-						marginBottom: 40,
-					}}
-					onChange={(event, newValue) => {
-						console.log("Found value: ", newValue)
+					<div style={{ display: "flex", flexDirection: "row", alignItems: "center", }}>
 
-						var parsedinput = { target: { value: newValue } }
-
-						// For variables
-						if (typeof newValue === 'string' && newValue.startsWith("$")) {
-							parsedinput = {
-								target: {
-									value: {
-										"name": newValue,
-										"id": newValue,
-										"actions": [],
-										"triggers": [],
-									}
-								}
-							}
-						}
-
-						handleWorkflowSelectionUpdate(parsedinput)
-					}}
-					renderOption={(props, data, state) => {
-						if (data.id === workflow.id) {
-							data = workflow;
-						}
-
-						return (
-							<Tooltip arrow placement="right" title={
-								<span style={{}}>
-									{data.image !== undefined && data.image !== null && data.image.length > 0 ?
-										<img src={data.image} alt={data.name} style={{ backgroundColor: theme.palette.surfaceColor, maxHeight: 200, minHeigth: 200, borderRadius: theme.palette?.borderRadius, }} />
-										: null}
-									<Typography>
-										Choose {data.name}
-									</Typography>
-								</span>
-							} placement="bottom">
-								<MenuItem
-									{...props}
-									style={{
+						{workflows !== undefined && workflows !== null && workflows.length > 0 ?
+							<Autocomplete
+								id="notification_workflow_search"
+								autoHighlight
+								open={openNotification}
+								onOpen={() => {
+									setOpenNotification(true);
+								}}
+								onClose={() => {
+									setOpenNotification(false);
+								}}
+								freeSolo
+								//autoSelect
+								value={workflows?.find(w => w.id === notificationWorkflow) || null}
+								classes={{ inputRoot: classes.inputRoot }}
+								ListboxProps={{
+									style: {
 										backgroundColor: theme.palette.surfaceColor,
-										color: data.id === workflow.id ? "red" : theme.palette.text.primary,
-										borderBottom: data.id === "parent" ? "2px solid rgba(255,255,255,0.5)" : null
-									}}
-									value={data}
-									onClick={(e) => {
-										props.onMouseDown?.(null);
-										var parsedinput = { target: { value: data } }
-										handleWorkflowSelectionUpdate(parsedinput)
-									}}
-								>
-									{data.name}
-								</MenuItem>
-							</Tooltip>
-						)
-					}}
-					renderInput={(params) => {
-						return (
-							<TextField
-								{...params}
+										color: theme.palette.text.primary,
+										borderRadius: theme.palette.borderRadius,
+									},
+								}}
+								getOptionLabel={(option) => {
+									if (
+										option === undefined ||
+										option === null ||
+										option.name === undefined ||
+										option.name === null
+									) {
+										return "No Workflow Selected";
+									}
+
+									const newname = (
+										option.name.charAt(0).toUpperCase() + option.name.substring(1)
+									).replaceAll("_", " ");
+									return newname;
+								}}
+								options={workflows}
+								fullWidth
 								style={{
 									backgroundColor: theme.palette.textFieldStyle.backgroundColor,
-									color: theme.palette.textFieldStyle.color,
 									borderRadius: theme.palette.textFieldStyle.borderRadius,
+									color: theme.palette.textFieldStyle.color,
 									height: 35,
-									fontSize: 16,
-									marginTop: "16px"
+									marginBottom: 40,
 								}}
+								onChange={(event, newValue) => {
+									console.log("Found value: ", newValue)
+
+									var parsedinput = { target: { value: newValue } }
+
+									// For variables
+									if (typeof newValue === 'string' && newValue.startsWith("$")) {
+										parsedinput = {
+											target: {
+												value: {
+													"name": newValue,
+													"id": newValue,
+													"actions": [],
+													"triggers": [],
+												}
+											}
+										}
+									}
+
+									handleWorkflowSelectionUpdate(parsedinput)
+								}}
+								renderOption={(props, data, state) => {
+									if (data.id === workflow.id) {
+										data = workflow;
+									}
+
+									return (
+										<Tooltip arrow placement="right" title={
+											<span style={{}}>
+												{data.image !== undefined && data.image !== null && data.image.length > 0 ?
+													<img src={data.image} alt={data.name} style={{ backgroundColor: theme.palette.surfaceColor, maxHeight: 200, minHeigth: 200, borderRadius: theme.palette?.borderRadius, }} />
+													: null}
+												<Typography>
+													Choose {data.name}
+												</Typography>
+											</span>
+										} placement="bottom">
+											<MenuItem
+												{...props}
+												style={{
+													backgroundColor: theme.palette.surfaceColor,
+													color: data.id === workflow.id ? "red" : theme.palette.text.primary,
+													borderBottom: data.id === "parent" ? "2px solid rgba(255,255,255,0.5)" : null
+												}}
+												value={data}
+												onClick={(e) => {
+													props.onMouseDown?.(null);
+													var parsedinput = { target: { value: data } }
+													handleWorkflowSelectionUpdate(parsedinput)
+												}}
+											>
+												{data.name}
+											</MenuItem>
+										</Tooltip>
+									)
+								}}
+								renderInput={(params) => {
+									return (
+										<TextField
+											{...params}
+											style={{
+												backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+												color: theme.palette.textFieldStyle.color,
+												borderRadius: theme.palette.textFieldStyle.borderRadius,
+												height: 35,
+												fontSize: 16,
+												marginTop: "16px"
+											}}
+											InputProps={{
+												...params.InputProps,
+												style: {
+													height: 35,
+													display: "flex",
+													alignItems: "center",
+													padding: "0px 8px",
+													fontSize: 16,
+													borderRadius: 4,
+												},
+												inputProps: {
+													...params.inputProps,
+													style: {
+														height: "100%",
+														boxSizing: "border-box",
+													}
+
+												}
+											}}
+											// label="Find a notification workflow"
+											variant="outlined"
+											placeholder="Select a notification workflow"
+										/>
+									);
+								}}
+							/>
+							:
+							<TextField
+								required
 								InputProps={{
-									...params.InputProps,
 									style: {
 										height: 35,
 										display: "flex",
@@ -491,7 +1666,6 @@ const Priorities = memo((props) => {
 										borderRadius: 4,
 									},
 									inputProps: {
-										...params.inputProps,
 										style: {
 											height: "100%",
 											boxSizing: "border-box",
@@ -499,198 +1673,171 @@ const Priorities = memo((props) => {
 
 									}
 								}}
-								// label="Find a notification workflow"
-								variant="outlined"	
-								placeholder="Select a notification workflow"
+								style={{
+									backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+									color: theme.palette.textFieldStyle.color,
+									borderRadius: 4,
+									height: 35,
+									fontSize: 16,
+									marginBottom: 30
+								}}
+								fullWidth={true}
+								type="name"
+								id="outlined-with-placeholder"
+								margin="normal"
+								variant="outlined"
+								placeholder="ID of the workflow to receive notifications"
+								value={notificationWorkflow}
+								onChange={(e) => {
+									setNotificationWorkflow(e.target.value);
+								}}
 							/>
-						);
-					}}
-				/>
-				:
-				<TextField
-					required
-					InputProps={{
-						style: {
-							height: 35,
-							display: "flex",
-							alignItems: "center",
-							padding: "0px 8px",
-							fontSize: 16,
-							borderRadius: 4,
-						},
-						inputProps: {
-							style: {
-								height: "100%",
-								boxSizing: "border-box",
-							}
-
 						}
-					}}
-					style={{
-						backgroundColor: theme.palette.textFieldStyle.backgroundColor,
-						color: theme.palette.textFieldStyle.color,
-						borderRadius: 4,
-						height: 35,
-						fontSize: 16,
-						marginBottom: 30
-					}}
-					fullWidth={true}
-					type="name"
-					id="outlined-with-placeholder"
-					margin="normal"
-					variant="outlined"
-					placeholder="ID of the workflow to receive notifications"
-					value={notificationWorkflow}
-					onChange={(e) => {
-						setNotificationWorkflow(e.target.value);
-					}}
-				/>
-			}
-			{/* <div style={{ minWidth: 150, maxWidth: 150, marginTop: 5, marginLeft: 10, }}>
+						{/* <div style={{ minWidth: 150, maxWidth: 150, marginTop: 5, marginLeft: 10, }}>
 				{orgSaveButton}
 			</div> */}
-		</div>
+					</div>
 
-		{notificationWorkflow === undefined || notificationWorkflow === null || notificationWorkflow.length === 0 ? null :
-			<div>
-				<Button disableElevation variant="outlined" color="secondary" style={{marginTop: 5, textTransform: "none", }} onClick={() => {
-					if (notificationWorkflow === "parent") {
-						toast.error("Can't send test notifications to the parent org's notification workflow.")
-						return
+					{notificationWorkflow === undefined || notificationWorkflow === null || notificationWorkflow.length === 0 ? null :
+						<div>
+							<Button disableElevation variant="outlined" color="secondary" style={{ marginTop: 5, textTransform: "none", }} onClick={() => {
+								if (notificationWorkflow === "parent") {
+									toast.error("Can't send test notifications to the parent org's notification workflow.")
+									return
+								}
+
+								fetch(`${globalUrl}/api/v1/workflows/${notificationWorkflow}/execute`, {
+									method: "POST",
+									headers: {
+										"Content-Type": "application/json",
+										"Accept": "application/json",
+									},
+									credentials: "include",
+									body: JSON.stringify({
+										"title": "Test Notification",
+										"description": "This is a test notification to check if the notification workflow is working correctly.",
+										"org_id": selectedOrganization.id,
+										"id": uuidv4(),
+										"reference_url": "/admin?type=test&admin_tab=notifications",
+										"created_at": Math.floor(new Date().getTime() / 1000),
+										"updated_at": Math.floor(new Date().getTime() / 1000),
+									})
+								})
+									.then((response) => {
+										if (response.status === 200) {
+											toast.success("Test notification sent successfully.")
+										} else {
+											toast.error("Failed to send test notification. Please contact support if this persists")
+										}
+									}).catch((error) => {
+										toast.error("Failed to send test notification (2). Please contact support if this persists")
+									})
+							}}>
+								Send test notification
+							</Button>
+							<IconButton
+								style={{ marginLeft: 10, }}
+								onClick={() => {
+									if (notificationWorkflow === "parent") {
+										toast.error("Can't open parent org's notification workflow from here.")
+										return
+									}
+
+									window.open(`/workflows/${notificationWorkflow}?view=executions`, "_blank")
+								}}
+							>
+								<OpenInNewIcon color="primary" />
+							</IconButton>
+						</div>
 					}
 
-					fetch(`${globalUrl}/api/v1/workflows/${notificationWorkflow}/execute`, {
-						method: "POST",
-						headers: {
-							"Content-Type": "application/json",
-							"Accept": "application/json",
-						},
-						credentials: "include",
-      					body: JSON.stringify({
-							"title": "Test Notification",
-							"description": "This is a test notification to check if the notification workflow is working correctly.",
-							"org_id": selectedOrganization.id,
-							"id": uuidv4(),
-							"reference_url": "/admin?type=test&admin_tab=notifications",
-							"created_at": Math.floor(new Date().getTime() / 1000),
-							"updated_at": Math.floor(new Date().getTime() / 1000),
+					<Typography variant="h5" style={{ marginTop: 50, fontSize: 24, display: clickedFromOrgTab ? null : "inline", marginBottom: clickedFromOrgTab ? 8 : null, }}>Notifications ({
+						notifications?.filter((notification) => showRead === true || notification.read === false).length
+					})</Typography>
+
+					<Typography variant="body2" color="textSecondary" style={{ fontSize: 16, marginLeft: clickedFromOrgTab ? null : 25, color: clickedFromOrgTab ? "#9E9E9E" : null, }}>
+						Notifications help you find potential problems with your workflows and apps.&nbsp;
+						<a
+							target="_blank"
+							rel="noopener noreferrer"
+							href="/docs/organizations#notifications"
+							style={{ textDecoration: clickedFromOrgTab ? null : "none", color: theme.palette.linkColor }}
+						>
+							Learn more
+						</a>
+					</Typography>
+					<div />
+					<div style={{ display: "flex", marginTop: 10, marginBottom: 10, }}>
+						<Switch
+							checked={showRead}
+							onChange={() => {
+								setShowRead(!showRead);
+							}}
+						/><Typography style={{ marginTop: 5, }}>&nbsp; Show read </Typography>
+						{notifications !== undefined && notifications !== null && notifications.length > 1 ? (
+							<Button
+								color="primary"
+								variant="outlined"
+								disabled={notifications.filter((data) => !data.read).length === 0}
+								onClick={() => {
+									clearNotifications()
+								}}
+								style={{ marginLeft: 50, textTransform: "none", fontSize: 16 }}
+							>
+								Mark all as read
+							</Button>
+						) : null}
+					</div>
+
+					<NotificationComponent notifications={notifications} showRead={showRead} selectedExecutionId={selectedExecutionId} selectedWorkflow={selectedWorkflow} highlightKMS={highlightKMS} userdata={userdata} imagesize={imagesize} boxColor={boxColor} clickedFromOrgTab={clickedFromOrgTab} notificationWidth={notificationWidth} dismissNotification={dismissNotification} />
+
+					{clickedFromOrgTab ? null : <Divider style={{ marginTop: 50, marginBottom: 50, }} />}
+
+					<Typography variant="h5" style={{ display: clickedFromOrgTab ? null : "inline", marginBottom: clickedFromOrgTab ? 8 : null, marginTop: clickedFromOrgTab ? 60 : null, }}>Suggestions</Typography>
+					<Typography variant="body2" color="texSecondary" style={{ fontSize: 16, marginLeft: clickedFromOrgTab ? null : 25, }}>
+						Suggestions are tasks identified by Shuffle to help you discover ways to protect your and customers' company. <br />These range from simple configurations in Shuffle to Usecases you may have missed.&nbsp;
+						<a
+							target="_blank"
+							rel="noopener noreferrer"
+							href="/docs/organizations#priorities"
+							style={{ textDecoration: clickedFromOrgTab ? null : "none", color: clickedFromOrgTab ? theme.palette.linkColor : "#f85a3e" }}
+						>
+							Learn more
+						</a>
+					</Typography>
+					<div style={{ marginTop: 10, }} />
+					<Switch
+						checked={showDismissed}
+						onChange={() => {
+							setShowDismissed(!showDismissed);
+						}}
+					/>&nbsp; Show dismissed
+					{userdata.priorities === null || userdata.priorities === undefined || userdata.priorities.length === 0 ?
+						<Typography variant="h4">
+							No Suggestions found
+						</Typography>
+						:
+						userdata.priorities.map((priority, index) => {
+							if (showDismissed === false && priority.active === false) {
+								return null
+							}
+
+							return (
+								<Priority
+									key={index}
+									globalUrl={globalUrl}
+									priority={priority}
+									checkLogin={checkLogin}
+									clickedFromOrgTab={true}
+									setAdminTab={setAdminTab}
+									setCurTab={setCurTab}
+									appFramework={appFramework}
+								/>
+							)
 						})
-					})
-					.then((response) => {
-						if (response.status === 200) {
-							toast.success("Test notification sent successfully.")
-						} else {
-							toast.error("Failed to send test notification. Please contact support if this persists")
-						}
-					}).catch((error) => {
-						toast.error("Failed to send test notification (2). Please contact support if this persists")
-					})
-				}}>
-					Send test notification
-				</Button>
-				<IconButton
-					style={{marginLeft: 10, }}
-					onClick={() => {
-						if (notificationWorkflow === "parent") {
-							toast.error("Can't open parent org's notification workflow from here.")
-							return
-						}
-
-						window.open(`/workflows/${notificationWorkflow}?view=executions`, "_blank")
-					}}
-				>
-					<OpenInNewIcon color="primary" />
-				</IconButton>
-			</div>
-		}
-
-		  <Typography variant="h5" style={{marginTop: 50, fontSize: 24, display: clickedFromOrgTab?null:"inline", marginBottom: clickedFromOrgTab? 8:null, }}>Notifications ({
-				notifications?.filter((notification) => showRead === true || notification.read === false).length
-				})</Typography>
-
-			<Typography variant="body2" color="textSecondary" style={{ fontSize: 16,  marginLeft: clickedFromOrgTab?null:25, color: clickedFromOrgTab?"#9E9E9E":null, }}>
-				Notifications help you find potential problems with your workflows and apps.&nbsp;
-				<a
-					target="_blank"
-					rel="noopener noreferrer"
-					href="/docs/organizations#notifications"
-					style={{ textDecoration: clickedFromOrgTab?null:"none", color: theme.palette.linkColor  }}
-				>
-					Learn more
-				</a>
-			</Typography>
-			<div/>
-			<div style={{display: "flex", marginTop: 10, marginBottom: 10, }}>
-				<Switch
-					checked={showRead}
-					onChange={() => {
-						setShowRead(!showRead);
-					}}
-				/><Typography style={{marginTop: 5, }}>&nbsp; Show read </Typography>
-				  {notifications !== undefined && notifications !== null && notifications.length > 1 ? (
-					<Button
-					  color="primary"
-					  variant="outlined"
-					  disabled={notifications.filter((data) => !data.read).length === 0}
-					  onClick={() => {
-						clearNotifications()
-					  }}
-					  style={{marginLeft: 50, textTransform: "none", fontSize: 16}}
-					>
-					  Mark all as read 
-					</Button>
-				  ) : null}
-			</div>
-
-			<NotificationComponent  notifications={notifications} showRead={showRead} selectedExecutionId={selectedExecutionId} selectedWorkflow={selectedWorkflow} highlightKMS={highlightKMS} userdata={userdata} imagesize={imagesize} boxColor={boxColor} clickedFromOrgTab={clickedFromOrgTab} notificationWidth={notificationWidth} dismissNotification={dismissNotification}/>
-
-			{clickedFromOrgTab? null : <Divider style={{marginTop: 50, marginBottom: 50, }} />}
-
-			<Typography variant="h5" style={{ display: clickedFromOrgTab ? null:"inline", marginBottom: clickedFromOrgTab ? 8:null, marginTop: clickedFromOrgTab ? 60 : null, }}>Suggestions</Typography>
-			<Typography variant="body2" color="texSecondary" style={{ fontSize: 16, marginLeft: clickedFromOrgTab ?null:25,  }}>
-				Suggestions are tasks identified by Shuffle to help you discover ways to protect your and customers' company. <br/>These range from simple configurations in Shuffle to Usecases you may have missed.&nbsp;
-				<a
-					target="_blank"
-					rel="noopener noreferrer"
-					href="/docs/organizations#priorities"
-					style={{ textDecoration: clickedFromOrgTab ?null:"none", color: clickedFromOrgTab ? theme.palette.linkColor :"#f85a3e" }}
-				>
-					Learn more
-				</a>
-			</Typography>
-			<div style={{marginTop: 10, }}/>
-			<Switch
-				checked={showDismissed}
-				onChange={() => {
-					setShowDismissed(!showDismissed);
-				}}
-			/>&nbsp; Show dismissed
-			{userdata.priorities === null || userdata.priorities === undefined || userdata.priorities.length === 0 ? 
-				<Typography variant="h4">
-					No Suggestions found
-				</Typography>
-				: 
-				userdata.priorities.map((priority, index) => {
-					if (showDismissed === false && priority.active === false) {
-						return null
 					}
-
-					return (
-						<Priority
-							key={index}
-							globalUrl={globalUrl}
-							priority={priority}
-							checkLogin={checkLogin}
-							clickedFromOrgTab={true}
-							setAdminTab={setAdminTab}
-							setCurTab={setCurTab}
-  							appFramework={appFramework}
-						/>
-					)
-				})
-			}
-		  </div>
-		  </div>
+				</div>
+			</div>
 		</div>
 	)
 })
@@ -699,15 +1846,15 @@ export default Priorities;
 
 
 const NotificationItem = memo((props) => {
-	const {data, selectedExecutionId, selectedWorkflow, highlightKMS, userdata, imagesize, boxColor, clickedFromOrgTab, notificationWidth, dismissNotification} = props
+	const { data, selectedExecutionId, selectedWorkflow, highlightKMS, userdata, imagesize, boxColor, clickedFromOrgTab, notificationWidth, dismissNotification } = props
 
 	var image = "";
 	var orgName = "";
 	var orgId = "";
 	const { themeMode, brandColor } = useContext(Context);
-  	const theme = getTheme(themeMode, brandColor);
-	
-	var highlighted = selectedExecutionId === "" && selectedWorkflow === "" ? false : data.reference_url === undefined || data.reference_url === null || data.reference_url.length === 0 ? false : data.reference_url.includes(selectedExecutionId) || data.reference_url.includes(selectedWorkflow) 
+	const theme = getTheme(themeMode, brandColor);
+
+	var highlighted = selectedExecutionId === "" && selectedWorkflow === "" ? false : data.reference_url === undefined || data.reference_url === null || data.reference_url.length === 0 ? false : data.reference_url.includes(selectedExecutionId) || data.reference_url.includes(selectedWorkflow)
 
 	if (!highlighted && highlightKMS) {
 		if (data.title !== undefined && data.title !== null && data.title.toLowerCase().includes("kms")) {
@@ -719,45 +1866,45 @@ const NotificationItem = memo((props) => {
 	}
 
 	if (userdata.orgs !== undefined) {
-	  const foundOrg = userdata.orgs.find((org) => org.id === data["org_id"]);
-	  if (foundOrg !== undefined && foundOrg !== null) {
-		//position: "absolute", bottom: 5, right: -5,
-		const imageStyle = {
-		  width: imagesize,
-		  height: imagesize,
-		  pointerEvents: "none",
-		  marginLeft:
-			data.creator_org !== undefined && data.creator_org.length > 0
-			  ? 20
-			  : 0,
-		  borderRadius: 10,
-		  border:
-			foundOrg.id === userdata.active_org.id
-			  ? `3px solid ${boxColor}`
-			  : null,
-		  cursor: "pointer",
-		  marginRight: 10,
-		};
+		const foundOrg = userdata.orgs.find((org) => org.id === data["org_id"]);
+		if (foundOrg !== undefined && foundOrg !== null) {
+			//position: "absolute", bottom: 5, right: -5,
+			const imageStyle = {
+				width: imagesize,
+				height: imagesize,
+				pointerEvents: "none",
+				marginLeft:
+					data.creator_org !== undefined && data.creator_org.length > 0
+						? 20
+						: 0,
+				borderRadius: 10,
+				border:
+					foundOrg.id === userdata.active_org.id
+						? `3px solid ${boxColor}`
+						: null,
+				cursor: "pointer",
+				marginRight: 10,
+			};
 
-		image =
-		  foundOrg.image === "" ? (
-			<img
-			  alt={foundOrg.name}
-			  src={theme.palette.defaultImage}
-			  style={imageStyle}
-			/>
-		  ) : (
-			<img
-			  alt={foundOrg.name}
-			  src={foundOrg.image}
-			  style={imageStyle}
-			  onClick={() => {}}
-			/>
-		  );
+			image =
+				foundOrg.image === "" ? (
+					<img
+						alt={foundOrg.name}
+						src={theme.palette.defaultImage}
+						style={imageStyle}
+					/>
+				) : (
+					<img
+						alt={foundOrg.name}
+						src={foundOrg.image}
+						style={imageStyle}
+						onClick={() => { }}
+					/>
+				);
 
-		orgName = foundOrg.name;
-		orgId = foundOrg.id;
-	  }
+			orgName = foundOrg.name;
+			orgId = foundOrg.id;
+		}
 	}
 
 	return (
@@ -776,185 +1923,185 @@ const NotificationItem = memo((props) => {
 					backgroundColor: theme.palette.cardHoverColor,
 				},
 			}}
-	  >
-		<div style={{display: "flex", }}>
-			{data.amount === 1 && data.read === false ? 
-				<Chip
-					label={"First seen"}
-					variant="contained"
-					color="primary"
-					style={{marginRight: 15, height: 25, }}
-				  />
-			: null}
-			{data.ignored === true ? 
-				<Chip
-					label={"Disabled"}
-					variant="outlined"
-					color="primary"
-					style={{marginRight: 15, height: 25, }}
-				  />
-			: null}
-			{data.read === false ?
-				<Chip
-					label={"Unread"}
-					style={{marginRight: 15, height: 25, }}
-				  />
-			: 
-				<Chip
-					label={"Read"}
-					variant="outlined"
-					color="secondary"
-					style={{marginRight: 15, height: 25, }}
-				  />
-			}
-			<Typography variant="body1" color="textPrimary" style={{ wordWrap: "break-word", overflow: "hidden", textOverflow: "ellipsis" }}>
-				{data.title}
-			</Typography >
-		</div>
-
-		{data.image !== undefined && data.image !== null && data.image.length > 0 ? 
-			<img alt={data.title} src={data.image} style={{height: 100, width: 100, }} />
-			: 
-			null
-		}
-		<Typography variant="body2" color="textSecondary" style={{ marginTop: 10, maxHeight: 200, overflowX: "hidden", overflowY: "auto", wordWrap: "break-word", fontSize: 16 }}>
-			{data.description}
-		</Typography >
-		<div style={{ display: "flex" }}>
-		<ButtonGroup style={{marginTop: 15, minHeight: 50, maxHeight: 50, }}>
-	<Button
-		variant="outlined"
-		color="primary"
-		style={{
-		textTransform: "none",
-		opacity: data.reference_url ? 1 : 0.5,
-		cursor: data.reference_url ? "pointer" : "not-allowed",
-		}}
-		disabled={
-		!data.reference_url || data.reference_url.length === 0
-		}
-		onClick={() => {
-		window.open(data.reference_url, "_blank");
-		}}
-	>
-		Explore
-	</Button>
-
-  {data.read === false ? (
-    <Button
-	  variant="outlined"
-	  color="secondary"
-	  style={{
-		  height: 50, 
-		  textTransform: "none",
-	  }}
-      onClick={() => {
-        dismissNotification(data.id);
-      }}
-    >
-     	Mark as Read 
-    </Button>
-  ) : null}
-
-	  <Tooltip
-		title="Disabling a notification makes it so similar notifications to this one will NOT be re-opened. It will NOT forward notifications to your notification workflow, but WILL still keep counting."
-		placement="top"
-	  >
-		<Button
-		  variant="outlined"
-		  color="secondary"
-		  style={{
-			textTransform: "none",
-			opacity: data.ignored || data.dismissable ? 1 : 0.5,
-			cursor: data.dismissable ? "pointer" : "not-allowed",
-		  }}
-		  disabled={!data.dismissable}
-		  onClick={() => {
-			if (data.ignored) {
-			  dismissNotification(data.id, false);
-			} else {
-			  dismissNotification(data.id, true);
-			}
-		  }}
 		>
-		  {data.ignored ? "Re-enable" : "Disable"}
-		</Button>
-	  </Tooltip>
-  </ButtonGroup> 
+			<div style={{ display: "flex", }}>
+				{data.amount === 1 && data.read === false ?
+					<Chip
+						label={"First seen"}
+						variant="contained"
+						color="primary"
+						style={{ marginRight: 15, height: 25, }}
+					/>
+					: null}
+				{data.ignored === true ?
+					<Chip
+						label={"Disabled"}
+						variant="outlined"
+						color="primary"
+						style={{ marginRight: 15, height: 25, }}
+					/>
+					: null}
+				{data.read === false ?
+					<Chip
+						label={"Unread"}
+						style={{ marginRight: 15, height: 25, }}
+					/>
+					:
+					<Chip
+						label={"Read"}
+						variant="outlined"
+						color="secondary"
+						style={{ marginRight: 15, height: 25, }}
+					/>
+				}
+				<Typography variant="body1" color="textPrimary" style={{ wordWrap: "break-word", overflow: "hidden", textOverflow: "ellipsis" }}>
+					{data.title}
+				</Typography >
+			</div>
 
-  <Typography
-    variant="body2"
-    color="textSecondary"
-    style={{
-      marginLeft: 20,
-      marginTop: 20,
-      wordWrap: "break-word",
-      overflow: "hidden",
-      textOverflow: "ellipsis",
-	  fontSize: 16,
+			{data.image !== undefined && data.image !== null && data.image.length > 0 ?
+				<img alt={data.title} src={data.image} style={{ height: 100, width: 100, }} />
+				:
+				null
+			}
+			<Typography variant="body2" color="textSecondary" style={{ marginTop: 10, maxHeight: 200, overflowX: "hidden", overflowY: "auto", wordWrap: "break-word", fontSize: 16 }}>
+				{data.description}
+			</Typography >
+			<div style={{ display: "flex" }}>
+				<ButtonGroup style={{ marginTop: 15, minHeight: 50, maxHeight: 50, }}>
+					<Button
+						variant="outlined"
+						color="primary"
+						style={{
+							textTransform: "none",
+							opacity: data.reference_url ? 1 : 0.5,
+							cursor: data.reference_url ? "pointer" : "not-allowed",
+						}}
+						disabled={
+							!data.reference_url || data.reference_url.length === 0
+						}
+						onClick={() => {
+							window.open(data.reference_url, "_blank");
+						}}
+					>
+						Explore
+					</Button>
 
-    }}
-  >
-    <b>First seen</b>:{" "}
-    {new Date(data.created_at * 1000).toISOString().slice(0, 19)}
-  </Typography>
+					{data.read === false ? (
+						<Button
+							variant="outlined"
+							color="secondary"
+							style={{
+								height: 50,
+								textTransform: "none",
+							}}
+							onClick={() => {
+								dismissNotification(data.id);
+							}}
+						>
+							Mark as Read
+						</Button>
+					) : null}
 
-  <Typography
-    variant="body2"
-    color="textSecondary"
-    style={{
-      marginLeft: 20,
-      marginTop: 20,
-      wordWrap: "break-word",
-      overflow: "hidden",
-      textOverflow: "ellipsis",
-	  fontSize: 16,
-    }}
-  >
-    <b>Last seen</b>:{" "}
-    {new Date(data.updated_at * 1000).toISOString().slice(0, 19)}
-  </Typography>
+					<Tooltip
+						title="Disabling a notification makes it so similar notifications to this one will NOT be re-opened. It will NOT forward notifications to your notification workflow, but WILL still keep counting."
+						placement="top"
+					>
+						<Button
+							variant="outlined"
+							color="secondary"
+							style={{
+								textTransform: "none",
+								opacity: data.ignored || data.dismissable ? 1 : 0.5,
+								cursor: data.dismissable ? "pointer" : "not-allowed",
+							}}
+							disabled={!data.dismissable}
+							onClick={() => {
+								if (data.ignored) {
+									dismissNotification(data.id, false);
+								} else {
+									dismissNotification(data.id, true);
+								}
+							}}
+						>
+							{data.ignored ? "Re-enable" : "Disable"}
+						</Button>
+					</Tooltip>
+				</ButtonGroup>
 
-  <Typography
-    variant="body2"
-    color="textSecondary"
-    style={{
-      marginLeft: 20,
-      marginTop: 20,
-      wordWrap: "break-word",
-      overflow: "hidden",
-      textOverflow: "ellipsis",
-	  fontSize: 16,
-    }}
-  >
-    <b>Times seen</b>: {data.amount}
-  </Typography>
-</div>
+				<Typography
+					variant="body2"
+					color="textSecondary"
+					style={{
+						marginLeft: 20,
+						marginTop: 20,
+						wordWrap: "break-word",
+						overflow: "hidden",
+						textOverflow: "ellipsis",
+						fontSize: 16,
 
-	  </Box>
+					}}
+				>
+					<b>First seen</b>:{" "}
+					{new Date(data.created_at * 1000).toISOString().slice(0, 19)}
+				</Typography>
+
+				<Typography
+					variant="body2"
+					color="textSecondary"
+					style={{
+						marginLeft: 20,
+						marginTop: 20,
+						wordWrap: "break-word",
+						overflow: "hidden",
+						textOverflow: "ellipsis",
+						fontSize: 16,
+					}}
+				>
+					<b>Last seen</b>:{" "}
+					{new Date(data.updated_at * 1000).toISOString().slice(0, 19)}
+				</Typography>
+
+				<Typography
+					variant="body2"
+					color="textSecondary"
+					style={{
+						marginLeft: 20,
+						marginTop: 20,
+						wordWrap: "break-word",
+						overflow: "hidden",
+						textOverflow: "ellipsis",
+						fontSize: 16,
+					}}
+				>
+					<b>Times seen</b>: {data.amount}
+				</Typography>
+			</div>
+
+		</Box>
 	);
 })
 
 
-const NotificationComponent = memo(({notifications, showRead, selectedExecutionId, selectedWorkflow, highlightKMS, userdata, imagesize, boxColor, clickedFromOrgTab, notificationWidth, dismissNotification}) => {
+const NotificationComponent = memo(({ notifications, showRead, selectedExecutionId, selectedWorkflow, highlightKMS, userdata, imagesize, boxColor, clickedFromOrgTab, notificationWidth, dismissNotification }) => {
 
-	return(
+	return (
 		<div>
 			{notifications === null || notifications === undefined || notifications?.length === 0 ? (
-			null
-		) : 
-			<div>
-				{notifications?.map((notification, index) => {
-					if (showRead === false && notification.read === true) {
-						return null
-					}
+				null
+			) :
+				<div>
+					{notifications?.map((notification, index) => {
+						if (showRead === false && notification.read === true) {
+							return null
+						}
 
-					return (
-						<NotificationItem data={notification} key={index} selectedExecutionId={selectedExecutionId} selectedWorkflow={selectedWorkflow} highlightKMS={highlightKMS} userdata={userdata} imagesize={imagesize} boxColor={boxColor} clickedFromOrgTab={clickedFromOrgTab} notificationWidth={notificationWidth} dismissNotification={dismissNotification} />
-					)
-				})}
-			</div>
-		}
+						return (
+							<NotificationItem data={notification} key={index} selectedExecutionId={selectedExecutionId} selectedWorkflow={selectedWorkflow} highlightKMS={highlightKMS} userdata={userdata} imagesize={imagesize} boxColor={boxColor} clickedFromOrgTab={clickedFromOrgTab} notificationWidth={notificationWidth} dismissNotification={dismissNotification} />
+						)
+					})}
+				</div>
+			}
 		</div>
 	)
 })
diff --git a/frontend/src/components/ShuffleCodeEditor1.jsx b/frontend/src/components/ShuffleCodeEditor1.jsx
index 33b37483..3132034f 100644
--- a/frontend/src/components/ShuffleCodeEditor1.jsx
+++ b/frontend/src/components/ShuffleCodeEditor1.jsx
@@ -132,7 +132,7 @@ const CodeEditor = (props) => {
 		fieldname,
 		contentLoading,
 		editorData,
-		handleSubflowParamChange,
+		handleTriggerParamChange,
 		setAiQueryModalOpen,
 		fullScreenMode,
 		environment,
@@ -212,7 +212,7 @@ const CodeEditor = (props) => {
 	const triggerField = searchParams.get('trigger_field');
 	const triggerName = searchParams.get('trigger_name');
 	const conditionId = searchParams.get('condition_id');
-	const conditionField = searchParams.get('field');
+	const conditionField = searchParams.get('condition_field');
 
 	useEffect(() => {
 		if (actionId === undefined || actionId === null) {
@@ -251,7 +251,7 @@ const CodeEditor = (props) => {
 		setSelectedCondition(condition);
 		// Update available variables when condition changes
 		updateAvailableVariables(actionlist);
-	}, [conditionId, fieldName])
+	}, [conditionId, conditionField])
 
 	// Extract variable updating logic into a separate function
 	const updateAvailableVariables = (actionlist) => {
@@ -2588,7 +2588,7 @@ const CodeEditor = (props) => {
 
 						// Handle condition fields
 						if (conditionField !== null && handleConditionFieldChange !== undefined) {
-							handleConditionFieldChange(conditionField, fieldName, fixedcodedata);
+							handleConditionFieldChange(conditionField, fixedcodedata);
 						}
 						// Handle action fields
 						else if (actionId !== undefined && actionId !== null && actionId.length > 0) {
@@ -2596,7 +2596,7 @@ const CodeEditor = (props) => {
 						}
 						// Handle trigger fields
 						else if (triggerId !== undefined && triggerId !== null && triggerId.length > 0) {
-							handleSubflowParamChange(triggerId, triggerField, fixedcodedata)
+							handleTriggerParamChange(triggerId, triggerField, fixedcodedata)
 						}
 
 						setExpansionModalOpen(false)
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index db5111bd..95b3e462 100755
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -13032,7 +13032,7 @@ const AngularWorkflow = (defaultprops) => {
                       event.preventDefault()
                       setExpansionModalOpen(true)
                       setActiveDialog("codeeditor")
-                      navigate(`?condition_id=${data.id}&field=${data.name}`)
+                      navigate(`?condition_id=${data.id}&condition_field=${data.name}`)
                       setEditorData({
                         "name": data.name,
                         "value": data.value || "",
@@ -13117,9 +13117,9 @@ const AngularWorkflow = (defaultprops) => {
         
           // Update the field value based on type
           if (type === "source") {
-            handleConditionFieldChange("source", "value", toComplete);
+            handleConditionFieldChange("source", toComplete);
           } else if (type === "destination") {
-            handleConditionFieldChange("destination", "value", toComplete);
+            handleConditionFieldChange("destination", toComplete);
           }
         
           handleMenuClose();
@@ -13996,7 +13996,7 @@ const AngularWorkflow = (defaultprops) => {
       />
     </Dialog>
 
-  const handleConditionFieldChange = (fieldType, fieldName, value) => {
+  const handleConditionFieldChange = (fieldType, value) => {
     if (fieldType === "source") {
       setSourceValue({
         ...sourceValue,
@@ -15197,7 +15197,7 @@ const AngularWorkflow = (defaultprops) => {
     }
   ]
 
-  const handleSubflowParamChange = (triggerId, triggerField, newData) => {
+  const handleTriggerParamChange = (triggerId, triggerField, newData) => {
 	var updateFail = "" 
 
     if (workflow !== undefined && workflow !== null) {  
@@ -17336,9 +17336,13 @@ const AngularWorkflow = (defaultprops) => {
           fullWidth
           rows="4"
           multiline
-          defaultValue={selectedTrigger.parameters[0]?.value}
+          value={selectedTriggerValue || ""}
           color="primary"
           placeholder=""
+          onChange={(e) => {  
+            setLastSaved(false)
+            setSelectedTriggerValue(e.target.value)
+          }}
           onBlur={(e) => {
             setLastSaved(false)
             setTriggerTextInformationWrapper(e.target.value);
@@ -25472,7 +25476,7 @@ const AngularWorkflow = (defaultprops) => {
             // selectedTrigger={selectedTrigger}
             aiSubmit={aiSubmit}
             toolsAppId={toolsApp.id}
-            handleSubflowParamChange={handleSubflowParamChange}
+            handleTriggerParamChange={handleTriggerParamChange}
             codedata={editorData.value}
             setcodedata={setcodedata}
             selectedEdge={selectedEdge}
diff --git a/frontend/src/views/LoginPage.jsx b/frontend/src/views/LoginPage.jsx
index 26bf6782..b2cb9426 100755
--- a/frontend/src/views/LoginPage.jsx
+++ b/frontend/src/views/LoginPage.jsx
@@ -314,12 +314,15 @@ const LoginPage = props => {
       },
     })
 
-	if (serverside !== true) {
-		const tmpMessage = new URLSearchParams(window.location.search).get("message")
-		if (tmpMessage !== undefined && tmpMessage !== null && message !== tmpMessage) {
-			setMessage(tmpMessage)
+	useEffect(() => {
+		if (serverside !== true) {
+			const tmpMessage = new URLSearchParams(window.location.search).get("message")
+			if (tmpMessage !== undefined && tmpMessage !== null && message !== tmpMessage) {
+				setMessage(tmpMessage)
+				toast(tmpMessage)
+			}
 		}
-	}
+	}, [])
 
 	if (document !== undefined) {
 		if (register) {
@@ -444,13 +447,17 @@ const LoginPage = props => {
 	}
 
 	if (isLoggedIn === true && serverside !== true) {
-		const tmpView = new URLSearchParams(window.location.search).get("view")
-		if (tmpView !== undefined && tmpView !== null && tmpView === "pricing") {
-			window.location.pathname = "/pricing"
-			return
-		} else if (tmpView !== undefined && tmpView !== null) {
-			window.location.pathname = tmpView
-			return
+		const tmpView = new URLSearchParams(window.location.search).get("view");
+		if (tmpView !== undefined && tmpView !== null) {
+			let pathOnly = tmpView.split("?")[0];
+			if (!pathOnly.startsWith("/")) pathOnly = "/" + pathOnly;
+
+			if (pathOnly === "/pricing" || pathOnly === "admin") {
+				window.location.replace(pathOnly + window.location.search);
+			} else {
+				window.location.replace(pathOnly);
+			}
+			return;
 		}
 
 		window.location.pathname = "/workflows"
@@ -575,20 +582,17 @@ const LoginPage = props => {
 							setCookie(responseJson["cookies"][key].key, responseJson["cookies"][key].value, { path: "/" })
 						}
 
-						const tmpView = new URLSearchParams(window.location.search).get("view")
+						const tmpView = new URLSearchParams(window.location.search).get("view");
 						if (tmpView !== undefined && tmpView !== null) {
-							//const newUrl = `/${tmpView}${decodeURIComponent(window.location.search)}`
-							// Check if slash in the url
+							let pathOnly = tmpView.split("?")[0];
+							if (!pathOnly.startsWith("/")) pathOnly = "/" + pathOnly;
 
-							var newUrl = `/${tmpView}`
-							if (tmpView.startsWith("/")) {
-								newUrl = `${tmpView}`
+							if (pathOnly === "/pricing" || pathOnly === "admin") {
+								window.location.replace(pathOnly + window.location.search);
+							} else {
+								window.location.replace(pathOnly);
 							}
-
-							console.log("Found url: ", newUrl)
-
-							window.location.pathname = newUrl
-							return
+							return;
 						}
 
 						console.log("LOGIN DATA: ", responseJson)
@@ -647,9 +651,14 @@ const LoginPage = props => {
 
 								const tmpView = new URLSearchParams(window.location.search).get("view")
 								if (tmpView !== undefined && tmpView !== null) {
-									//const newUrl = `/${tmpView}${decodeURIComponent(window.location.search)}`
-									const newUrl = `/${tmpView}`
-									window.location.pathname = newUrl
+									let pathOnly = tmpView.split("?")[0];
+									if (!pathOnly.startsWith("/")) pathOnly = "/" + pathOnly;
+
+									if (pathOnly === "/pricing" || pathOnly === "admin") {
+										window.location.replace(pathOnly + window.location.search);
+									} else {
+										window.location.replace(pathOnly);
+									}
 									return
 								}
 
diff --git a/frontend/src/views/SettingsPage.jsx b/frontend/src/views/SettingsPage.jsx
index f10dbfb7..ec5ba658 100755
--- a/frontend/src/views/SettingsPage.jsx
+++ b/frontend/src/views/SettingsPage.jsx
@@ -458,7 +458,12 @@ const Settings = (props) => {
           if (responseJson["success"] === false) {
             setPasswordFormMessage(responseJson["reason"]);
           } else {
-            toast("Changed password!");
+			var reason = ""
+			if (responseJson.reason !== undefined && responseJson.reason !== null && responseJson.reason.length > 0) {
+				reason += responseJson.reason
+			}
+
+            toast.success("Changed password! " + reason);
             setPasswordFormMessage("");
           }
         })
diff --git a/frontend/src/views/Workflows2.jsx b/frontend/src/views/Workflows2.jsx
index 1655c901..c059f991 100644
--- a/frontend/src/views/Workflows2.jsx
+++ b/frontend/src/views/Workflows2.jsx
@@ -5071,7 +5071,7 @@ const Workflows2 = (props) => {
 
     //isLoaded && isLoggedIn && workflowDone ? (
     const loadedCheck =
-        workflowDone ? (
+        workflowDone && isLoaded ? (
             <div>
                 {/*
 				<ShepherdTour steps={newSteps} tourOptions={tourOptions}>
@@ -5134,7 +5134,9 @@ const Workflows2 = (props) => {
                 }}
             >
                 <CircularProgress />
-                <Typography>Loading Workflows</Typography>
+                <Typography style={{marginTop: 5, }}>
+					Loading Workflows and Apps
+				</Typography>
             </div>
         );