diff --git a/frontend/src/views/Admin.jsx b/frontend/src/views/Admin.jsx
index 81f1ea7b..11ee1967 100644
--- a/frontend/src/views/Admin.jsx
+++ b/frontend/src/views/Admin.jsx
@@ -3650,7 +3650,26 @@ const Admin = (props) => {
                   bgColor = "#1f2023";
                 }
 
-								console.log("Auth data: ", data)
+								//console.log("Auth data: ", data)
+								if (data.type === "oauth2") {
+									data.fields = [
+									{
+										"key": "url",
+										"value": "Secret. Replaced during app execution!",
+									},
+									{
+										"key": "client_id",
+										"value": "Secret. Replaced during app execution!",
+									},
+									{
+										"key": "client_secret",
+										"value": "Secret. Replaced during app execution!",
+									},
+									{
+										"key": "scope",
+										"value": "Secret. Replaced during app execution!",
+									}]
+								}
 
                 return (
                   <ListItem key={index} style={{ backgroundColor: bgColor }}>
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index 8603a68c..5385aae4 100644
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -1515,7 +1515,7 @@ const AngularWorkflow = (defaultprops) => {
       })
       .catch((error) => {
 				setAppsLoaded(true)
-        alert.error("App loading error: ", error.toString());
+        alert.error("App loading error: "+error.toString());
       });
   };
 
@@ -3085,6 +3085,7 @@ const AngularWorkflow = (defaultprops) => {
         }
       }
 
+
       if (
         nodedata.parameters !== undefined &&
         nodedata.parameters !== null &&
@@ -5134,6 +5135,8 @@ const AngularWorkflow = (defaultprops) => {
 
       // AUTHENTICATION
       if (app.authentication.required) {
+				console.log("App auth is required!")
+
         // Setup auth here :)
         const authenticationOptions = [];
         var findAuthId = "";
@@ -5145,6 +5148,7 @@ const AngularWorkflow = (defaultprops) => {
           findAuthId = newAppData.authentication_id;
         }
 
+				console.log("Found auth: ", findAuthId)
         var tmpAuth = JSON.parse(JSON.stringify(appAuthentication));
         for (var key in tmpAuth) {
           var item = tmpAuth[key];
diff --git a/frontend/src/views/GettingStarted.jsx b/frontend/src/views/GettingStarted.jsx
index c9598828..37d537ed 100644
--- a/frontend/src/views/GettingStarted.jsx
+++ b/frontend/src/views/GettingStarted.jsx
@@ -2,6 +2,7 @@ import React, { useEffect, useContext } from "react";
 import { makeStyles } from "@material-ui/core/styles";
 import { useTheme } from "@material-ui/core/styles";
 
+import ReactGA from 'react-ga';
 import SecurityFramework from '../components/SecurityFramework.jsx';
 
 import {
@@ -67,7 +68,7 @@ import { DataGrid, GridToolbar } from "@material-ui/data-grid";
 //import JSONPrettyMon from 'react-json-pretty/dist/monikai'
 import Dropzone from "../components/Dropzone";
 
-import { Link } from "react-router-dom";
+import { useNavigate, Link, useParams } from "react-router-dom";
 import { useAlert } from "react-alert";
 import ChipInput from "material-ui-chip-input";
 import { v4 as uuidv4 } from "uuid";
@@ -440,6 +441,7 @@ const GettingStarted = (props) => {
   const theme = useTheme();
   const alert = useAlert();
   const classes = useStyles(theme);
+	let navigate = useNavigate();
   const imgSize = 60;
 
   const referenceUrl = globalUrl + "/api/v1/hooks/";
@@ -2504,12 +2506,19 @@ const GettingStarted = (props) => {
 		const textSpacingDiff = 8
 		const textType = "body2"
 						
-		// Discover <a target="_blank" href="https://shuffler.io/creators" style={{textDecoration: "none", color: "#f86a3e",}}>use-cases made by other creators</a>!
+		// Discover <a target="_blank" href="https://shuffler.io/search?tab=workflows" style={{textDecoration: "none", color: "#f86a3e",}}>use-cases made by us and other creators</a>!
 		const steps = [
 			{
 				html: (
-					<Typography variant={textType} style={{marginTop: textSpacingDiff}}>
-						<Link to="/detectionframework" style={{textDecoration: "none", color: "#f86a3e",}}>Find your integrations</Link> by following our simple detection framework!
+					<Typography variant={textType} style={{marginTop: textSpacingDiff}} onClick={() => {
+						if (isCloud) {
+							ReactGA.event({
+								category: "getting-started",
+								action: `integerations_find_click`,
+							})
+						}
+					}}>
+						<Link to="/detectionframework" style={{textDecoration: "none", color: "#f86a3e",}}>Discover your apps</Link> by following our simple security model!
 					</Typography>
 				), 
 				tutorial: "find_integrations",
@@ -2517,27 +2526,45 @@ const GettingStarted = (props) => {
 			{
 				html: 
 					<Typography variant={textType} style={{marginTop: textSpacingDiff}}>
-								Discover <span style={{cursor: "pointer", textDecoration: "none", color: "#f86a3e",}} onClick={() => {
+							Discover <span style={{cursor: "pointer", textDecoration: "none", color: "#f86a3e",}} onClick={() => {
+    
+  						if (isCloud) {
+								navigate(`/search?tab=workflows`)
+
+								ReactGA.event({
+									category: "getting-started",
+									action: `workflow_find_click`,
+								})
+								return
+							} else {
 								alert.success("TBD: Coming in version 1.0.0");
+							}
 
-								const ele = document.getElementById("shuffle_search_field")
-								if (ele !== undefined && ele !== null) {
-									console.log("Found ele: ", ele)
-									ele.focus()
-									ele.style.borderColor = "#f86a3e"
-									ele.style.borderWidth = "2px"
+							const ele = document.getElementById("shuffle_search_field")
+							if (ele !== undefined && ele !== null) {
+								console.log("Found ele: ", ele)
+								ele.focus()
+								ele.style.borderColor = "#f86a3e"
+								ele.style.borderWidth = "2px"
 
-								} else {
-									alert.success("TBD: Coming in version 1.0.0");
-								}
-							}}>
-							use-cases made by other creators</span>!
+							} else {
+								alert.success("TBD: Coming in version 1.0.0");
+							}
+						}}>
+						use-cases made by other creators</span>!
 					</Typography>,
 				tutorial: "discover_workflows",
 			},
 			{
 				html: (
-					<Typography variant={textType} style={{marginTop: textSpacingDiff}}>
+					<Typography variant={textType} style={{marginTop: textSpacingDiff}} onClick={() => {
+						if (isCloud) {
+							ReactGA.event({
+								category: "getting-started",
+								action: `create_workflow_click`,
+							})
+						}
+					}}>
 						Learn to use Shuffle by&nbsp; 
 						<span style={{cursor: "pointer", color: "#f86a3e",}} onClick={() => {setModalOpen(true)}}>
 							creating your first workflow