diff --git a/litmus-portal/frontend/src/views/ChaosWorkflows/BrowseSchedule/SaveTemplateModal.tsx b/litmus-portal/frontend/src/views/ChaosWorkflows/BrowseSchedule/SaveTemplateModal.tsx
index 215ece6b1..8d21bedcf 100644
--- a/litmus-portal/frontend/src/views/ChaosWorkflows/BrowseSchedule/SaveTemplateModal.tsx
+++ b/litmus-portal/frontend/src/views/ChaosWorkflows/BrowseSchedule/SaveTemplateModal.tsx
@@ -14,6 +14,7 @@ import useStyles from './styles';
 import { getProjectID } from '../../../utils/getSearchParams';
 import Loader from '../../../components/Loader';
 import { constants } from '../../../constants';
+import { validateWorkflowName } from '../../../utils/validate';
 
 interface SaveTemplateModalProps {
   closeTemplate: () => void;
@@ -89,9 +90,14 @@ const SaveTemplateModal: React.FC<SaveTemplateModalProps> = ({
         label="Name of the template"
         value={templateName}
         data-cy="WorkflowName"
-        helperText=""
         required
-        onChange={(e) => setTemplateName(e.target.value)}
+        onChange={(e) => setTemplateName(e.target.value.toLowerCase())}
+        helperText={
+          validateWorkflowName(templateName)
+            ? t('createWorkflow.chooseWorkflow.validate')
+            : ''
+        }
+        variant={validateWorkflowName(templateName) ? 'error' : 'primary'}
         className={classes.InputFieldTemplate}
       />
       <br />
@@ -133,6 +139,7 @@ const SaveTemplateModal: React.FC<SaveTemplateModalProps> = ({
               cloneResult.type === constants.success ||
               templateName.trim().length === 0 ||
               templateDesc.trim().length === 0 ||
+              validateWorkflowName(templateName) ||
               !yamlValid
             }
           >
diff --git a/litmus-portal/frontend/src/views/ChaosWorkflows/BrowseSchedule/TableData.tsx b/litmus-portal/frontend/src/views/ChaosWorkflows/BrowseSchedule/TableData.tsx
index 8ed9bfe86..eb7821d31 100644
--- a/litmus-portal/frontend/src/views/ChaosWorkflows/BrowseSchedule/TableData.tsx
+++ b/litmus-portal/frontend/src/views/ChaosWorkflows/BrowseSchedule/TableData.tsx
@@ -169,6 +169,7 @@ const TableData: React.FC<TableDataProps> = ({
         width="60%"
         open={isTemplateModalOpen}
         onClose={handleCloseTemplate}
+        disableBackdropClick
         modalActions={
           <ButtonOutlined onClick={handleCloseTemplate}>
             &#x2715;
diff --git a/litmus-portal/frontend/src/views/ChaosWorkflows/BrowseSchedule/styles.ts b/litmus-portal/frontend/src/views/ChaosWorkflows/BrowseSchedule/styles.ts
index d77033515..b3454efc2 100644
--- a/litmus-portal/frontend/src/views/ChaosWorkflows/BrowseSchedule/styles.ts
+++ b/litmus-portal/frontend/src/views/ChaosWorkflows/BrowseSchedule/styles.ts
@@ -59,8 +59,10 @@ const useStyles = makeStyles((theme) => ({
     '& p': {
       fontSize: '0.8125rem',
       fontWeight: 'bold',
+      color: theme.palette.text.hint,
     },
     '& th': {
+      color: theme.palette.text.hint,
       backgroundColor: theme.palette.cards.background,
     },
   },
diff --git a/litmus-portal/frontend/src/views/ChaosWorkflows/Runs/styles.ts b/litmus-portal/frontend/src/views/ChaosWorkflows/Runs/styles.ts
index c09fc9a38..62f9551be 100644
--- a/litmus-portal/frontend/src/views/ChaosWorkflows/Runs/styles.ts
+++ b/litmus-portal/frontend/src/views/ChaosWorkflows/Runs/styles.ts
@@ -78,7 +78,7 @@ const useStyles = makeStyles((theme) => ({
     '& th': {
       fontWeight: 'bold',
       fontSize: '0.8125rem',
-      color: theme.palette.text.disabled,
+      color: theme.palette.text.hint,
       backgroundColor: theme.palette.cards.background,
     },
   },
diff --git a/litmus-portal/frontend/src/views/CreateWorkflow/ChooseWorkflow/SelectMyHub.tsx b/litmus-portal/frontend/src/views/CreateWorkflow/ChooseWorkflow/SelectMyHub.tsx
index f5770d71a..35e72bb55 100644
--- a/litmus-portal/frontend/src/views/CreateWorkflow/ChooseWorkflow/SelectMyHub.tsx
+++ b/litmus-portal/frontend/src/views/CreateWorkflow/ChooseWorkflow/SelectMyHub.tsx
@@ -17,7 +17,7 @@ const SelectMyHub = () => {
   const [availableHubs, setAvailableHubs] = useState<MyHubDetail[]>([]);
 
   // Get all MyHubs with status
-  const { data, loading } = useQuery<HubStatus>(GET_HUB_STATUS, {
+  const { data } = useQuery<HubStatus>(GET_HUB_STATUS, {
     variables: { data: selectedProjectID },
     fetchPolicy: 'cache-and-network',
   });
@@ -38,17 +38,33 @@ const SelectMyHub = () => {
   };
 
   useEffect(() => {
-    if (data?.getHubStatus.length) {
-      setAvailableHubs([...data.getHubStatus]);
-      data.getHubStatus.forEach((hubData) => {
-        if (hubData.HubName.toLowerCase() === 'chaos hub') {
-          setSelectedHub('Chaos Hub');
-          localforage.setItem('selectedHub', 'Chaos Hub');
-          localforage.setItem('hasSetWorkflowData', false);
-        }
-      });
+    if (data?.getHubStatus !== undefined) {
+      if (data.getHubStatus.length) {
+        const hubDetails: MyHubDetail[] = [];
+        data.getHubStatus.forEach((hub) => {
+          /**
+           * Push only available hubs
+           */
+          if (hub.IsAvailable) {
+            hubDetails.push({
+              id: hub.id,
+              HubName: hub.HubName,
+              RepoBranch: hub.RepoBranch,
+              RepoURL: hub.RepoURL,
+            });
+          }
+        });
+        setAvailableHubs(hubDetails);
+        data.getHubStatus.forEach((hubData) => {
+          if (hubData.HubName.toLowerCase() === 'chaos hub') {
+            setSelectedHub('Chaos Hub');
+            localforage.setItem('selectedHub', 'Chaos Hub');
+            localforage.setItem('hasSetWorkflowData', false);
+          }
+        });
+      }
     }
-  }, [loading]);
+  }, [data]);
 
   const classes = useStyles();
   return (
diff --git a/litmus-portal/frontend/src/views/CreateWorkflow/ChooseWorkflow/choosePreDefinedExperiments.tsx b/litmus-portal/frontend/src/views/CreateWorkflow/ChooseWorkflow/choosePreDefinedExperiments.tsx
index c6e0f1ed3..e58e9bc2b 100644
--- a/litmus-portal/frontend/src/views/CreateWorkflow/ChooseWorkflow/choosePreDefinedExperiments.tsx
+++ b/litmus-portal/frontend/src/views/CreateWorkflow/ChooseWorkflow/choosePreDefinedExperiments.tsx
@@ -45,7 +45,7 @@ const ChoosePreDefinedExperiments: React.FC<ChoosePreDefinedExperimentsProps> =
     const [workflowList, setWorkflowlist] = useState([]);
 
     // Get all MyHubs with status
-    const { data, loading } = useQuery<HubStatus>(GET_HUB_STATUS, {
+    const { data } = useQuery<HubStatus>(GET_HUB_STATUS, {
       variables: { data: selectedProjectID },
       fetchPolicy: 'cache-and-network',
     });
@@ -111,7 +111,21 @@ const ChoosePreDefinedExperiments: React.FC<ChoosePreDefinedExperimentsProps> =
     useEffect(() => {
       if (data?.getHubStatus !== undefined) {
         if (data.getHubStatus.length) {
-          setAvailableHubs([...data.getHubStatus]);
+          const hubDetails: MyHubDetail[] = [];
+          data.getHubStatus.forEach((hub) => {
+            /**
+             * Push only available hub
+             */
+            if (hub.IsAvailable) {
+              hubDetails.push({
+                id: hub.id,
+                HubName: hub.HubName,
+                RepoBranch: hub.RepoBranch,
+                RepoURL: hub.RepoURL,
+              });
+            }
+          });
+          setAvailableHubs(hubDetails);
         }
         data.getHubStatus.forEach((hubData) => {
           if (hubData.HubName.toLowerCase() === 'chaos hub') {
@@ -126,7 +140,7 @@ const ChoosePreDefinedExperiments: React.FC<ChoosePreDefinedExperimentsProps> =
           }
         });
       }
-    }, [loading]);
+    }, [data]);
 
     return (
       <AccordionDetails>
diff --git a/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/index.tsx b/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/index.tsx
index 5578cd3fe..ff4f40b09 100644
--- a/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/index.tsx
+++ b/litmus-portal/frontend/src/views/CreateWorkflow/TuneWorkflow/index.tsx
@@ -279,11 +279,13 @@ const TuneWorkflow = forwardRef((_, ref) => {
    */
   const getSelectedWorkflowDetails = () => {
     localforage.getItem('workflow').then((workflow) => {
-      setWorkflow({
-        name: (workflow as WorkflowDetailsProps).name,
-        crd: (workflow as WorkflowDetailsProps).CRDLink,
-        description: (workflow as WorkflowDetailsProps).description,
-      });
+      if (workflow) {
+        setWorkflow({
+          name: (workflow as WorkflowDetailsProps).name,
+          crd: (workflow as WorkflowDetailsProps).CRDLink,
+          description: (workflow as WorkflowDetailsProps).description,
+        });
+      }
     });
     localforage.getItem('selectedScheduleOption').then((value) => {
       /**