diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod
index fb22f268..1a886389 100644
--- a/backend/go-app/go.mod
+++ b/backend/go-app/go.mod
@@ -1,6 +1,6 @@
 module shuffle
 
-go 1.22.2
+go 1.22
 
 require (
 	cloud.google.com/go/datastore v1.15.0
diff --git a/frontend/src/components/NewHeader.jsx b/frontend/src/components/NewHeader.jsx
index 8617f457..e830467e 100644
--- a/frontend/src/components/NewHeader.jsx
+++ b/frontend/src/components/NewHeader.jsx
@@ -37,9 +37,7 @@ import {
   EmojiObjects as EmojiObjectsIcon,
   Business as BusinessIcon,
   Polyline as PolylineIcon,
-} from "@mui/icons-material";
-
-import {
+  Add as AddIcon,
   Analytics as AnalyticsIcon,
   Lightbulb as LightbulbIcon,
 } from "@mui/icons-material";
@@ -247,6 +245,7 @@ const Header = (props) => {
     var image = "";
     var orgName = "";
     var orgId = "";
+
     if (userdata.orgs !== undefined) {
       const foundOrg = userdata.orgs.find((org) => org.id === data["org_id"]);
       if (foundOrg !== undefined && foundOrg !== null) {
@@ -942,7 +941,7 @@ const Header = (props) => {
             {userdata === undefined ||
             userdata.orgs === undefined ||
             userdata.orgs === null ||
-            userdata.orgs.length <= 1 ? null : (
+            userdata.orgs.length <= 0 ? null : (
               <span style={{ paddingTop: 5 }}>
                 <Select
                   disableUnderline
@@ -969,6 +968,10 @@ const Header = (props) => {
                   value={userdata.active_org.id}
                   fullWidth
                   onChange={(e) => {
+					if (e.target.value === undefined || e.target.value === "create_new_suborgs") {
+						return
+					}
+
                     handleClickChangeOrg(e.target.value);
                   }}
                 >
@@ -1099,6 +1102,32 @@ const Header = (props) => {
                       </MenuItem>
                     );
                   })}
+				  <Divider />
+				  <Link to="/admin?tab=suborgs" style={hrefStyle}>
+					  <MenuItem
+						key={"add suborgs"}
+						style={{
+						  backgroundColor: theme.palette.inputColor,
+						  color: "white",
+						  height: 40,
+						  zIndex: 10003,
+						}}
+						value={"create_new_suborgs"}
+					  >
+						<Tooltip
+						  color="primary"
+						  title={""}
+						  placement="left"
+						>
+						  <div style={{ display: "flex", marginLeft: 85, }}>
+							<AddIcon />
+							<span style={{ marginLeft: 8 }}>
+								Add suborgs
+							</span>
+						  </div>
+						</Tooltip>
+					  </MenuItem>
+					</Link>
                 </Select>
               </span>
             )}
diff --git a/frontend/src/components/Searchfield.jsx b/frontend/src/components/Searchfield.jsx
index 1652c55d..a13422bd 100644
--- a/frontend/src/components/Searchfield.jsx
+++ b/frontend/src/components/Searchfield.jsx
@@ -97,7 +97,7 @@ const SearchField = props => {
 				}}><CloseIcon /></Button>
 			</div>
 				: null}
-			<DialogContent style={{}}>
+			<DialogContent className='dialog-content' style={{}}>
 				<SearchBox globalUrl={globalUrl} setModalOpen={setModalOpen} modalOpen={modalOpen} serverside={serverside} userdata={userdata} />
 			</DialogContent>
 			<Divider style={{overflow: "hidden"}}/>
diff --git a/frontend/src/views/Admin.jsx b/frontend/src/views/Admin.jsx
index a02f0930..ceebabdd 100755
--- a/frontend/src/views/Admin.jsx
+++ b/frontend/src/views/Admin.jsx
@@ -6243,7 +6243,7 @@ If you're interested, please let me know a time that works for you, or set up a
               letterSpacing: "1px",
             }}
           >
-            All Tenants
+            All Your Organizations 
           </h3>
         </div>
 
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index 3df13f42..af90c8d9 100755
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -11890,6 +11890,7 @@ const AngularWorkflow = (defaultprops) => {
                     borderRadius: theme.palette.borderRadius,
                   }}
                   onChange={(event, newValue) => {
+      				setLastSaved(false)
 					console.log("Found value: ", newValue)
 
 					var parsedinput = { target: { value: newValue } }
@@ -11923,10 +11924,10 @@ const AngularWorkflow = (defaultprops) => {
                             <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}
+                            Choose Subflow '{data.name}'
                           </Typography>
                         </span>
-                      } placement="bottom">
+                      }>
                         <MenuItem
                           style={{
                             backgroundColor: theme.palette.inputColor,
@@ -12015,6 +12016,7 @@ const AngularWorkflow = (defaultprops) => {
                       borderRadius: theme.palette.borderRadius,
                     }}
                     onChange={(event, newValue) => {
+      				  setLastSaved(false)
                       handleSubflowStartnodeSelection({ target: { value: newValue } })
                     }}
             		renderOption={(props, action, state) => {
@@ -12114,9 +12116,10 @@ const AngularWorkflow = (defaultprops) => {
                   workflow.triggers[selectedTriggerIndex].parameters[1].value
                 }
                 onBlur={(e) => {
-                  workflow.triggers[selectedTriggerIndex].parameters[1].value =
-                    e.target.value;
-                  setWorkflow(workflow);
+      			  setLastSaved(false)
+
+                  workflow.triggers[selectedTriggerIndex].parameters[1].value = e.target.value
+                  setWorkflow(workflow)
                 }}
               />
               {!showDropdown ? null :
@@ -13455,10 +13458,10 @@ const AngularWorkflow = (defaultprops) => {
               	              <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}
+              	              Choose Trigger '{data.name}'
               	            </Typography>
               	          </span>
-              	        } placement="bottom">
+              	        }>
               	          <MenuItem
               	            style={{
               	              color: data.id === workflow.id ? "red" : "white",