diff --git a/public/discord-mark-blue.svg b/public/discord-mark-blue.svg
new file mode 100644
index 000000000000..4cadbc7f7ed3
--- /dev/null
+++ b/public/discord-mark-blue.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 127.14 96.36"><path fill="#5865f2" d="M107.7,8.07A105.15,105.15,0,0,0,81.47,0a72.06,72.06,0,0,0-3.36,6.83A97.68,97.68,0,0,0,49,6.83,72.37,72.37,0,0,0,45.64,0,105.89,105.89,0,0,0,19.39,8.09C2.79,32.65-1.71,56.6.54,80.21h0A105.73,105.73,0,0,0,32.71,96.36,77.7,77.7,0,0,0,39.6,85.25a68.42,68.42,0,0,1-10.85-5.18c.91-.66,1.8-1.34,2.66-2a75.57,75.57,0,0,0,64.32,0c.87.71,1.76,1.39,2.66,2a68.68,68.68,0,0,1-10.87,5.19,77,77,0,0,0,6.89,11.1A105.25,105.25,0,0,0,126.6,80.22h0C129.24,52.84,122.09,29.11,107.7,8.07ZM42.45,65.69C36.18,65.69,31,60,31,53s5-12.74,11.43-12.74S54,46,53.89,53,48.84,65.69,42.45,65.69Zm42.24,0C78.41,65.69,73.25,60,73.25,53s5-12.74,11.44-12.74S96.23,46,96.12,53,91.08,65.69,84.69,65.69Z"/></svg>
\ No newline at end of file
diff --git a/src/components/CippComponents/CippFormCondition.jsx b/src/components/CippComponents/CippFormCondition.jsx
index 1763091fbe27..7d3dfd029b68 100644
--- a/src/components/CippComponents/CippFormCondition.jsx
+++ b/src/components/CippComponents/CippFormCondition.jsx
@@ -51,7 +51,7 @@ export const CippFormCondition = (props) => {
         if (watcher.includes(compareValue)) {
           return children;
         }
-      } else if (typeof watcher === "object" && compareValue in watcher) {
+      } else if (typeof watcher === "object" && watcher !== null && compareValue in watcher) {
         // Check if object contains the key
         return children;
       }
diff --git a/src/components/CippComponents/CippSpeedDial.jsx b/src/components/CippComponents/CippSpeedDial.jsx
new file mode 100644
index 000000000000..4313ace7a7ef
--- /dev/null
+++ b/src/components/CippComponents/CippSpeedDial.jsx
@@ -0,0 +1,222 @@
+import React, { useState, useEffect } from "react";
+import {
+  SpeedDial,
+  SpeedDialAction,
+  SpeedDialIcon,
+  Dialog,
+  DialogTitle,
+  DialogContent,
+  DialogActions,
+  Button,
+  Snackbar,
+  Alert,
+  CircularProgress,
+} from "@mui/material";
+import { Close as CloseIcon } from "@mui/icons-material";
+import { useForm } from "react-hook-form";
+import { CippFormComponent } from "../../components/CippComponents/CippFormComponent";
+
+const CippSpeedDial = ({
+  actions = [],
+  position = { bottom: 16, right: 16 },
+  icon,
+  openIcon = <CloseIcon />,
+}) => {
+  const [openDialogs, setOpenDialogs] = useState({});
+  const [loading, setLoading] = useState(false);
+  const [showSnackbar, setShowSnackbar] = useState(false);
+  const [speedDialOpen, setSpeedDialOpen] = useState(false);
+  const [isHovering, setIsHovering] = useState(false);
+  const [snackbarMessage, setSnackbarMessage] = useState("");
+
+  const formControls = actions.reduce((acc, action) => {
+    if (action.form) {
+      acc[action.id] = useForm({
+        mode: "onChange",
+        defaultValues: action.form.defaultValues || {},
+      });
+    }
+    return acc;
+  }, {});
+
+  const handleSpeedDialClose = () => {
+    if (!isHovering) {
+      setTimeout(() => {
+        setSpeedDialOpen(false);
+      }, 200);
+    }
+  };
+
+  const handleMouseEnter = () => {
+    setIsHovering(true);
+    setSpeedDialOpen(true);
+  };
+
+  const handleMouseLeave = () => {
+    setIsHovering(false);
+    handleSpeedDialClose();
+  };
+
+  const handleDialogOpen = (actionId) => {
+    setOpenDialogs((prev) => ({ ...prev, [actionId]: true }));
+  };
+
+  const handleDialogClose = (actionId) => {
+    setOpenDialogs((prev) => ({ ...prev, [actionId]: false }));
+  };
+
+  const handleSubmit = async (actionId, data) => {
+    if (!actions.find((a) => a.id === actionId)?.onSubmit) return;
+
+    setLoading(true);
+    try {
+      const action = actions.find((a) => a.id === actionId);
+      const result = await action.onSubmit(data);
+
+      if (result.success) {
+        formControls[actionId]?.reset();
+        handleDialogClose(actionId);
+      }
+      setSnackbarMessage(result.message);
+      setShowSnackbar(true);
+    } catch (error) {
+      console.error(`Error submitting ${actionId}:`, error);
+      setSnackbarMessage("An error occurred while submitting");
+      setShowSnackbar(true);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  useEffect(() => {
+    const handleClickOutside = (event) => {
+      if (speedDialOpen) {
+        const speedDial = document.querySelector('[aria-label="Navigation SpeedDial"]');
+        if (speedDial && !speedDial.contains(event.target)) {
+          setSpeedDialOpen(false);
+        }
+      }
+    };
+
+    document.addEventListener("click", handleClickOutside);
+    return () => {
+      document.removeEventListener("click", handleClickOutside);
+    };
+  }, [speedDialOpen]);
+
+  return (
+    <>
+      <SpeedDial
+        ariaLabel="Navigation SpeedDial"
+        sx={{
+          position: "fixed",
+          ...position,
+          "& .MuiFab-primary": {
+            width: 46,
+            height: 46,
+            "&:hover": {
+              backgroundColor: "primary.dark",
+            },
+          },
+        }}
+        icon={<SpeedDialIcon icon={icon} openIcon={openIcon} />}
+        open={speedDialOpen}
+        onClose={handleSpeedDialClose}
+        onOpen={() => setSpeedDialOpen(true)}
+        onMouseEnter={handleMouseEnter}
+        onMouseLeave={handleMouseLeave}
+      >
+        {actions.map((action) => (
+          <SpeedDialAction
+            key={action.id}
+            icon={action.icon}
+            tooltipTitle={action.name}
+            onClick={() => {
+              if (action.form) {
+                handleDialogOpen(action.id);
+              } else if (action.onClick) {
+                action.onClick();
+              }
+              setSpeedDialOpen(false);
+            }}
+            tooltipOpen
+            sx={{
+              "&.MuiSpeedDialAction-fab": {
+                backgroundColor: "background.paper",
+                "&:hover": {
+                  backgroundColor: "action.hover",
+                },
+              },
+              "& .MuiSpeedDialAction-staticTooltipLabel": {
+                cursor: "pointer",
+                whiteSpace: "nowrap",
+                marginRight: "10px",
+                padding: "6px 10px",
+                "&:hover": {
+                  backgroundColor: "action.hover",
+                },
+              },
+            }}
+          />
+        ))}
+      </SpeedDial>
+
+      {actions
+        .filter((action) => action.form)
+        .map((action) => (
+          <Dialog
+            key={action.id}
+            open={openDialogs[action.id] || false}
+            onClose={() => handleDialogClose(action.id)}
+            maxWidth="md"
+            fullWidth
+          >
+            <DialogTitle>{action.form.title}</DialogTitle>
+            <DialogContent>
+              <CippFormComponent
+                type="richText"
+                name={action.form.fieldName}
+                required
+                formControl={formControls[action.id]}
+                style={{ minHeight: "150px" }}
+                editorProps={{
+                  attributes: {
+                    style: "min-height: 150px; font-size: 1.1rem; padding: 1rem;",
+                  },
+                }}
+              />
+            </DialogContent>
+            <DialogActions>
+              <Button onClick={() => handleDialogClose(action.id)} disabled={loading}>
+                Cancel
+              </Button>
+              <Button
+                onClick={formControls[action.id]?.handleSubmit((data) =>
+                  handleSubmit(action.id, data)
+                )}
+                variant="contained"
+                color="primary"
+                disabled={loading}
+                startIcon={loading ? <CircularProgress size={20} /> : null}
+              >
+                {loading ? "Submitting..." : action.form.submitText || "Submit"}
+              </Button>
+            </DialogActions>
+          </Dialog>
+        ))}
+
+      <Snackbar
+        open={showSnackbar}
+        autoHideDuration={6000}
+        onClose={() => setShowSnackbar(false)}
+        anchorOrigin={{ vertical: "bottom", horizontal: "center" }}
+      >
+        <Alert onClose={() => setShowSnackbar(false)} severity="success" sx={{ width: "100%" }}>
+          {snackbarMessage}
+        </Alert>
+      </Snackbar>
+    </>
+  );
+};
+
+export default CippSpeedDial;
diff --git a/src/components/CippComponents/CippUserActions.jsx b/src/components/CippComponents/CippUserActions.jsx
index f88d909281e8..cf30780eb5e8 100644
--- a/src/components/CippComponents/CippUserActions.jsx
+++ b/src/components/CippComponents/CippUserActions.jsx
@@ -292,7 +292,7 @@ export const CippUserActions = () => {
       },
       confirmText: "Are you sure you want to clear the Immutable ID for this user?",
       multiPost: false,
-      condition: (row) => row.onPremisesSyncEnabled,
+      condition: (row) => !row.onPremisesSyncEnabled && row?.onPremisesImmutableId,
     },
     {
       label: "Revoke all user sessions",
diff --git a/src/pages/_app.js b/src/pages/_app.js
index 702eb328927c..e520d50c5822 100644
--- a/src/pages/_app.js
+++ b/src/pages/_app.js
@@ -20,6 +20,14 @@ import { LocalizationProvider } from "@mui/x-date-pickers/LocalizationProvider";
 import { AdapterDateFns } from "@mui/x-date-pickers/AdapterDateFns";
 import TimeAgo from "javascript-time-ago";
 import en from "javascript-time-ago/locale/en.json";
+import CippSpeedDial from "../components/CippComponents/CippSpeedDial";
+import {
+  Help as HelpIcon,
+  BugReport as BugReportIcon,
+  Feedback as FeedbackIcon,
+} from "@mui/icons-material";
+import { SvgIcon } from "@mui/material";
+import discordIcon from "../../public/discord-mark-blue.svg";
 import React from "react";
 TimeAgo.addDefaultLocale(en);
 
@@ -36,6 +44,33 @@ const App = (props) => {
   const getLayout = Component.getLayout ?? ((page) => page);
   const preferredTheme = useMediaPredicate("(prefers-color-scheme: dark)") ? "dark" : "light";
 
+  const speedDialActions = [
+    {
+      id: "bug-report",
+      icon: <BugReportIcon />,
+      name: "Report Bug",
+      href: "https://github.com/KelvinTegelaar/CIPP/issues/new?template=bug.yml",
+      onClick: () => window.open("https://github.com/KelvinTegelaar/CIPP/issues/new?template=bug.yml", "_blank")
+    },
+    {
+      id: "feature-request",
+      icon: <FeedbackIcon />,
+      name: "Request Feature",
+      href: "https://github.com/KelvinTegelaar/CIPP/issues/new?template=feature.yml",
+      onClick: () => window.open("https://github.com/KelvinTegelaar/CIPP/issues/new?template=feature.yml", "_blank")
+    },
+    {
+      id: "discord",
+      icon: (
+        <SvgIcon component={discordIcon} viewBox="0 0 127.14 96.36" sx={{ fontSize: '1.5rem' }}>
+        </SvgIcon>
+      ),
+      name: "Join the Discord!",
+      href: "https://discord.gg/cyberdrain",
+      onClick: () => window.open("https://discord.gg/cyberdrain", "_blank")
+    },
+  ];
+
   return (
     <CacheProvider value={emotionCache}>
       <Head>
@@ -69,6 +104,11 @@ const App = (props) => {
                             <PrivateRoute>{getLayout(<Component {...pageProps} />)}</PrivateRoute>
                           </ErrorBoundary>
                           <Toaster position="top-center" />
+                          <CippSpeedDial
+                            actions={speedDialActions}
+                            icon={<HelpIcon />}
+                            position={{ bottom: 16, right: 16 }}
+                          />
                         </RTL>
                       </ThemeProvider>
                       {settings?.showDevtools && (
diff --git a/src/pages/email/transport/list-connectors/add.jsx b/src/pages/email/transport/list-connectors/add.jsx
index 5410d79c653d..8d173c49908b 100644
--- a/src/pages/email/transport/list-connectors/add.jsx
+++ b/src/pages/email/transport/list-connectors/add.jsx
@@ -27,9 +27,9 @@ const AddPolicy = () => {
   return (
     <CippFormPage
       formControl={formControl}
-      queryKey="AddTransportRule"
-      title="Add Transport Rule"
-      backButtonTitle="Transport Rules Overview"
+      queryKey="AddConnector"
+      title="Add Connector"
+      backButtonTitle="Connectors Overview"
       postUrl="/api/AddExConnector"
     >
       <Grid container spacing={2} sx={{ mb: 2 }}>
@@ -55,7 +55,7 @@ const AddPolicy = () => {
             formControl={formControl}
             multiple={false}
             api={{
-              queryKey: `TemplateListTransport`,
+              queryKey: `TemplateListConnectors`,
               labelField: "name",
               valueField: (option) => option,
               url: "/api/ListExconnectorTemplates",
diff --git a/src/pages/email/transport/list-connectors/index.js b/src/pages/email/transport/list-connectors/index.js
index 477b191fdff5..6f2f9fe11539 100644
--- a/src/pages/email/transport/list-connectors/index.js
+++ b/src/pages/email/transport/list-connectors/index.js
@@ -22,8 +22,9 @@ const Page = () => {
       type: "POST",
       url: "/api/EditExConnector",
       icon: <Check />,
+      condition: (row) => !row.Enabled,
       data: {
-        State: "Enable",
+        State: "!Enable",
         GUID: "Guid",
         Type: "cippconnectortype",
       },
@@ -35,8 +36,9 @@ const Page = () => {
       type: "POST",
       url: "/api/EditExConnector",
       icon: <Block />,
+      condition: (row) => row.Enabled,
       data: {
-        State: "Disable",
+        State: "!Disable",
         GUID: "Guid",
         Type: "cippconnectortype",
       },
@@ -82,11 +84,6 @@ const Page = () => {
       actions={actions}
       offCanvas={offCanvas}
       simpleColumns={simpleColumns}
-      titleButton={{
-        label: "Deploy Connector",
-        href: "/email/connectors/deploy-connector",
-        startIcon: <RocketLaunch />, // Added icon
-      }}
       cardButton={
         <>
           <Button
diff --git a/src/pages/identity/administration/users/index.js b/src/pages/identity/administration/users/index.js
index 5d646a68fb69..0b67a7ece144 100644
--- a/src/pages/identity/administration/users/index.js
+++ b/src/pages/identity/administration/users/index.js
@@ -31,6 +31,7 @@ const Page = () => {
   const offCanvas = {
     extendedInfoFields: [
       "createdDateTime", // Created Date (UTC)
+      "id", // Unique ID
       "userPrincipalName", // UPN
       "givenName", // Given Name
       "surname", // Surname
@@ -42,7 +43,7 @@ const Page = () => {
       "city", // City
       "department", // Department
       "onPremisesLastSyncDateTime", // OnPrem Last Sync
-      "id", // Unique ID
+      "onPremisesDistinguishedName", // OnPrem DN
       "otherMails", // Alternate Email Addresses
     ],
     actions: CippUserActions(),
@@ -69,7 +70,7 @@ const Page = () => {
         Endpoint: "users",
         manualPagination: true,
         $select:
-          "id,accountEnabled,businessPhones,city,createdDateTime,companyName,country,department,displayName,faxNumber,givenName,isResourceAccount,jobTitle,mail,mailNickname,mobilePhone,onPremisesDistinguishedName,officeLocation,onPremisesLastSyncDateTime,otherMails,postalCode,preferredDataLocation,preferredLanguage,proxyAddresses,showInAddressList,state,streetAddress,surname,usageLocation,userPrincipalName,userType,assignedLicenses,onPremisesSyncEnabled",
+          "id,accountEnabled,businessPhones,city,createdDateTime,companyName,country,department,displayName,faxNumber,givenName,isResourceAccount,jobTitle,mail,mailNickname,mobilePhone,officeLocation,otherMails,postalCode,preferredDataLocation,preferredLanguage,proxyAddresses,showInAddressList,state,streetAddress,surname,usageLocation,userPrincipalName,userType,assignedLicenses,onPremisesSyncEnabled,OnPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesDistinguishedName",
         $count: true,
         $orderby: "displayName",
         $top: 999,
diff --git a/src/pages/tools/templatelib/index.jsx b/src/pages/tools/templatelib/index.jsx
index 18349fab9b8d..2b46fde8cb9e 100644
--- a/src/pages/tools/templatelib/index.jsx
+++ b/src/pages/tools/templatelib/index.jsx
@@ -1,11 +1,13 @@
 import React from "react";
-import { Grid, Divider, Typography, CircularProgress, Alert } from "@mui/material";
+import { Grid, Divider, Typography, CircularProgress, Alert, Chip } from "@mui/material";
 import { useForm } from "react-hook-form";
 import { Layout as DashboardLayout } from "/src/layouts/index.js";
 import CippFormPage from "/src/components/CippFormPages/CippFormPage";
 import CippFormComponent from "/src/components/CippComponents/CippFormComponent";
 import { useSettings } from "/src/hooks/use-settings";
 import { CippFormTenantSelector } from "../../../components/CippComponents/CippFormTenantSelector";
+import { Box } from "@mui/system";
+import { CippFormCondition } from "../../../components/CippComponents/CippFormCondition";
 
 const TemplateLibrary = () => {
   const currentTenant = useSettings().currentTenant;
@@ -26,8 +28,10 @@ const TemplateLibrary = () => {
     const unixTime = Math.floor(startDate.getTime() / 1000) - 45;
 
     return {
-      TenantFilter: values.tenantFilter.value,
-      Name: `CIPP Template ${values.tenantFilter.value}`,
+      TenantFilter: values?.tenantFilter?.value ? values?.tenantFilter?.value : "No tenant",
+      Name: `CIPP Template ${
+        values.tenantFilter?.value ? values.tenantFilter?.value : values.templateRepo?.value
+      }`,
       Command: { value: `New-CIPPTemplateRun` },
       Parameters: { TemplateSettings: { ...values } },
       ScheduledTime: unixTime,
@@ -46,22 +50,63 @@ const TemplateLibrary = () => {
     >
       <Grid container spacing={3}>
         <Grid item xs={12}>
-          <Typography>
+          <Typography sx={{ mb: 2 }}>
             Template libraries are tenants set up to retrieve the latest version of a specific
             tenants policies. These are then stored in CIPPs templates, allowing you to keep an up
             to date copy of the policies.This copy occurs every 4 hours.
           </Typography>
+          <Typography>
+            There are also template repositories, these are community driven and are used to share
+            templates with other users. Template repositories are downloaded when new versions are
+            released.
+          </Typography>
           <Alert severity="warning" sx={{ my: 2 }}>
             Enabling this feature will overwrite templates with the same name.
           </Alert>
         </Grid>
 
         <Divider sx={{ my: 2, width: "100%" }} />
-
-        <Grid item xs={12} md={6}>
-          <CippFormTenantSelector formControl={formControl} multiple={false} />
+        <Grid
+          container
+          spacing={2}
+          sx={{
+            alignItems: "center",
+            m: 3,
+          }}
+        >
+          <Grid item xs={12} md={5}>
+            <Box sx={{ my: "auto" }}>
+              <CippFormTenantSelector formControl={formControl} multiple={false} />
+            </Box>
+          </Grid>
+          <Grid item xs={12} md={0.7}>
+            <Box sx={{ my: "auto" }}>
+              <Chip label="OR" color="info" />
+            </Box>
+          </Grid>
+          <Grid item xs={12} md={5}>
+            <Box sx={{ my: "auto" }}>
+              <CippFormComponent
+                name="templateRepo"
+                type="autoComplete"
+                label="Template Repository"
+                options={[
+                  {
+                    label: "Open Intune Baseline - https://skiptotheendpoint.co.uk/",
+                    value: "CIPP-OIB",
+                  },
+                  { label: "CIPP Recommended Baseline - https://cipp.app", value: "CIPP-CIPP" },
+                  {
+                    label: "Conditional Access Framework - https://www.joeyverlinden.com/",
+                    value: "CIPP-CAF",
+                  },
+                ]}
+                formControl={formControl}
+                multiple={false}
+              />
+            </Box>
+          </Grid>
         </Grid>
-
         <Divider sx={{ my: 2, width: "100%" }} />
 
         <Grid item xs={12}>
@@ -95,6 +140,28 @@ const TemplateLibrary = () => {
             formControl={formControl}
           />
         </Grid>
+        <CippFormCondition
+          formControl={formControl}
+          field="templateRepo"
+          compareType="contains"
+          compareValue={"CIPP-"}
+        >
+          <Grid item xs={12}>
+            <Typography variant="h6">Template Repository files</Typography>
+            <CippFormComponent
+              type="switch"
+              name="standardsconfig"
+              label="Create Template Standards"
+              formControl={formControl}
+            />
+            <CippFormComponent
+              type="switch"
+              name="groupTemplates"
+              label="Create Group Templates"
+              formControl={formControl}
+            />
+          </Grid>
+        </CippFormCondition>
       </Grid>
     </CippFormPage>
   );