diff --git a/src/components/tool/guide/Config/AlertHelper.js b/src/components/tool/guide/Config/AlertHelper.js
index 81f2cb2f..64fc7e3b 100644
--- a/src/components/tool/guide/Config/AlertHelper.js
+++ b/src/components/tool/guide/Config/AlertHelper.js
@@ -1,10 +1,12 @@
 import { Alert, AlertIcon, Box, CloseButton, Flex } from "@chakra-ui/react";
 
+import React from "react";
+
 export default function AlertHelper({
   alertDismissible = true,
   alertType = "info",
-  alertMsg = null,
   onClose = {},
+  children = null,
 }) {
   return (
     <>
@@ -13,9 +15,9 @@ export default function AlertHelper({
         <Box w="100%">
           <Alert display="flex" status={alertType}>
             <AlertIcon />
-            {alertMsg && typeof alertMsg === "function"
-              ? alertMsg()
-              : `${alertMsg}`}
+            {children && typeof children === "string"
+              ? `${children}`
+              : React.isValidElement(children) && children}
             {alertDismissible && (
               <CloseButton
                 size="sm"
diff --git a/src/components/tool/guide/Config/ConfigMultipleNumbers.js b/src/components/tool/guide/Config/ConfigMultipleNumbers.js
index 033f73ae..16cd48b8 100644
--- a/src/components/tool/guide/Config/ConfigMultipleNumbers.js
+++ b/src/components/tool/guide/Config/ConfigMultipleNumbers.js
@@ -55,9 +55,10 @@ export default function ConfigMultipleNumbers({
         <AlertHelper
           alertDismissible={alertDismissible}
           alertType={alertType}
-          alertMsg={alertMsg}
           onClose={onClose}
-        />
+        >
+          {alertMsg}
+        </AlertHelper>
       )}
     </>
   );
diff --git a/src/components/tool/guide/Config/ConfigPicker.js b/src/components/tool/guide/Config/ConfigPicker.js
index c7aa4bf4..e073c7c3 100644
--- a/src/components/tool/guide/Config/ConfigPicker.js
+++ b/src/components/tool/guide/Config/ConfigPicker.js
@@ -34,9 +34,10 @@ export default function ConfigPicker({
         <AlertHelper
           alertDismissible={alertDismissible}
           alertType={alertType}
-          alertMsg={alertMsg}
           onClose={onClose}
-        />
+        >
+          {alertMsg}
+        </AlertHelper>
       )}
     </>
   );
diff --git a/src/components/tool/guide/Config/ConfigSlider.js b/src/components/tool/guide/Config/ConfigSlider.js
index b22c5618..e63383ae 100644
--- a/src/components/tool/guide/Config/ConfigSlider.js
+++ b/src/components/tool/guide/Config/ConfigSlider.js
@@ -34,9 +34,10 @@ export default function ConfigSlider({
         <AlertHelper
           alertDismissible={alertDismissible}
           alertType={alertType}
-          alertMsg={alertMsg}
           onClose={onClose}
-        />
+        >
+          {alertMsg}
+        </AlertHelper>
       )}
     </>
   );
diff --git a/src/components/tool/guide/EresearchJob/EresearchJob.js b/src/components/tool/guide/EresearchJob/EresearchJob.js
index fe713bde..af4f070d 100644
--- a/src/components/tool/guide/EresearchJob/EresearchJob.js
+++ b/src/components/tool/guide/EresearchJob/EresearchJob.js
@@ -78,20 +78,6 @@ const getConfigGroups = (config, onConfigChange = () => {}) => {
       };
     },
     nodes: () => {
-      const mpiAlertMsg = () => {
-        return (
-          <TextWithLink
-            textBeforeLink={"Only use more than 1 node if you are using "}
-            link={{
-              href: "https://hpc-wiki.info/hpc/MPI",
-              text: "MPI",
-              isExternal: true,
-            }}
-            hasExternalIcon={true}
-            textAfterLink={"-type software."}
-          />
-        );
-      };
       return {
         element: (key, selected) => (
           <ConfigSlider
@@ -109,7 +95,18 @@ const getConfigGroups = (config, onConfigChange = () => {}) => {
             }}
             showAlert={config?.nodes > 1}
             alertType="warning"
-            alertMsg={mpiAlertMsg}
+            alertMsg={
+              <TextWithLink
+                textBeforeLink={"Only use more than 1 node if you are using "}
+                link={{
+                  href: "https://hpc-wiki.info/hpc/MPI",
+                  text: "MPI",
+                  isExternal: true,
+                }}
+                hasExternalIcon={true}
+                textAfterLink={"-type software."}
+              />
+            }
           />
         ),
         show: (config) =>
@@ -211,20 +208,6 @@ const getConfigGroups = (config, onConfigChange = () => {}) => {
           ["GPU", "Accelerated GPU"],
         ];
       }
-      const customAlertMsg = () => {
-        return (
-          <TextWithLink
-            textBeforeLink={"IPUs are currently unavailable. Please "}
-            link={{
-              href: "https://eresearchqut.atlassian.net/servicedesk/customer/portals",
-              text: "contact eResearch if interested",
-              isExternal: true,
-            }}
-            hasExternalIcon={true}
-            textAfterLink={"."}
-          />
-        );
-      };
       return {
         element: (key, selected) => (
           <ConfigPicker
@@ -239,7 +222,18 @@ const getConfigGroups = (config, onConfigChange = () => {}) => {
             }}
             showAlert={config?.hardware === "IPU"}
             alertType="warning"
-            alertMsg={customAlertMsg}
+            alertMsg={
+              <TextWithLink
+                textBeforeLink={"IPUs are currently unavailable. Please "}
+                link={{
+                  href: "https://eresearchqut.atlassian.net/servicedesk/customer/portals",
+                  text: "contact eResearch if interested",
+                  isExternal: true,
+                }}
+                hasExternalIcon={true}
+                textAfterLink={"."}
+              />
+            }
           />
         ),
         show: (config) => config?.service,
diff --git a/src/components/tool/guide/HuggingFacePipeline/Model.js b/src/components/tool/guide/HuggingFacePipeline/Model.js
index d6c5ca32..d1a422bf 100644
--- a/src/components/tool/guide/HuggingFacePipeline/Model.js
+++ b/src/components/tool/guide/HuggingFacePipeline/Model.js
@@ -1,6 +1,5 @@
 import { CloseIcon, ExternalLinkIcon } from "@chakra-ui/icons";
 import {
-  Alert,
   Box,
   Button,
   Flex,
@@ -26,6 +25,7 @@ import {
 } from "@choc-ui/chakra-autocomplete";
 
 import useData from "../../../hooks/useData";
+import AlertHelper from "../Config/AlertHelper";
 
 function ModelAutoComplete({ model, onModelChange, models }) {
   return (
@@ -238,9 +238,9 @@ export function Model({ model, onModelChange, task }) {
 
   if (modelsError) {
     return (
-      <Alert status="error">
-        Error retrieving models: {modelsError.message}
-      </Alert>
+      <AlertHelper alertType={"error"} alertDismissible={false}>
+        {`Error retrieving models: ${modelsError.message}`}
+      </AlertHelper>
     );
   } else if (modelsLoading) {
     return <Progress colorScheme="yellow" isIndeterminate />;
diff --git a/src/components/tool/guide/Instructions/AccessInstructions.js b/src/components/tool/guide/Instructions/AccessInstructions.js
index 96813660..40373e98 100644
--- a/src/components/tool/guide/Instructions/AccessInstructions.js
+++ b/src/components/tool/guide/Instructions/AccessInstructions.js
@@ -1,5 +1,6 @@
-import { Code, Link } from "@chakra-ui/react";
+import { Code } from "@chakra-ui/react";
 
+import TextWithLink from "../../../navigation/TextWithLink";
 import CopyBox from "../../../output/CopyBox";
 import InstructionHeading from "./components/InstructionHeading";
 import InstructionText from "./components/InstructionText";
@@ -37,10 +38,17 @@ export function AccessInstructions({ service, port, node, username }) {
       )}
       <InstructionHeading>Access the tool</InstructionHeading>
       <InstructionText>
-        In your web browser, navigate to the following address:{" "}
-        <Link href={`http://localhost:${port}`} isExternal color="blue.500">
-          http://localhost:{port}
-        </Link>
+        <TextWithLink
+          textBeforeLink={
+            "In your web browser, navigate to the following address: "
+          }
+          link={{
+            href: `http://localhost:${port}`,
+            text: `http://localhost:${port}`,
+            color: "blue.500",
+            isExternal: true,
+          }}
+        />
       </InstructionText>
       <CopyBox>http://localhost:{port}</CopyBox>
     </>
diff --git a/src/components/tool/guide/Instructions/ConnectInstructions.js b/src/components/tool/guide/Instructions/ConnectInstructions.js
index 3bbdb31d..98b53c83 100644
--- a/src/components/tool/guide/Instructions/ConnectInstructions.js
+++ b/src/components/tool/guide/Instructions/ConnectInstructions.js
@@ -1,6 +1,8 @@
-import { Alert, AlertIcon, Box, Code, Link, Text } from "@chakra-ui/react";
+import { Box, Code, Flex } from "@chakra-ui/react";
 
+import TextWithLink from "../../../navigation/TextWithLink";
 import CopyBox from "../../../output/CopyBox";
+import AlertHelper from "../Config/AlertHelper";
 import InstructionHeading from "./components/InstructionHeading";
 import InstructionText from "./components/InstructionText";
 import { OperatingSystemTabs } from "./components/OperatingSystemTabs";
@@ -9,48 +11,62 @@ function LyraInstructions({ username }) {
   return (
     <>
       <InstructionHeading>Connect to Lyra</InstructionHeading>
-      <Alert status="info">
-        <AlertIcon />
-        If you are off-campus, you will first need to connect to the QUT network
-        using the VPN.
-      </Alert>
+      <AlertHelper alertType="info" alertDismissible={false}>
+        {
+          "If you are off-campus, you will first need to connect to the QUT network using the VPN."
+        }
+      </AlertHelper>
       <InstructionText>
-        See the instructions{" "}
-        <Link
-          href="https://qutvirtual4.qut.edu.au/group/research-students/conducting-research/specialty-research-facilities/advanced-research-computing-storage/supercomputing/getting-started-with-hpc"
-          isExternal
-          color="blue.500"
-        >
-          here
-        </Link>{" "}
-        for more information about how to use Lyra.
+        <TextWithLink
+          textBeforeLink={"See the instructions "}
+          link={{
+            href: "https://qutvirtual4.qut.edu.au/group/research-students/conducting-research/specialty-research-facilities/advanced-research-computing-storage/supercomputing/getting-started-with-hpc",
+            text: "here",
+            color: "blue.500",
+            isExternal: true,
+          }}
+          textAfterLink={" for more information about how to use Lyra."}
+        />
       </InstructionText>
       <OperatingSystemTabs>
         <Box>
-          <Alert status="info">
-            <AlertIcon />
-            <Text mb="0">
-              You may need to enable the{" "}
-              <Link
-                href="https://learn.microsoft.com/en-us/windows/terminal/tutorials/ssh"
-                isExternal
-                color="blue.500"
-              >
-                ssh feature
-              </Link>{" "}
-              in Windows.
-            </Text>
-          </Alert>
+          <AlertHelper alertType={"info"} alertDismissible={false}>
+            <TextWithLink
+              textBeforeLink={"You may need to enable the "}
+              link={{
+                href: "https://learn.microsoft.com/en-us/windows/terminal/tutorials/ssh",
+                text: "ssh feature",
+                color: "blue.500",
+                isExternal: true,
+              }}
+              hasExternalIcon={false}
+              textAfterLink={" in Windows."}
+            />
+          </AlertHelper>
           <InstructionText>
-            In{" "}
-            <Link href="https://aka.ms/terminal" isExternal color="blue.500">
-              Windows Terminal
-            </Link>
-            , Powershell,{" "}
-            <Link href="https://www.putty.org/" isExternal color="blue.500">
-              PuTTY
-            </Link>
-            , or cmd.exe, run the following command to connect to Lyra:
+            <Flex alignItems={"center"}>
+              <TextWithLink
+                textBeforeLink={"In "}
+                link={{
+                  href: "https://aka.ms/terminal",
+                  text: "Windows Terminal",
+                  color: "blue.500",
+                  isExternal: true,
+                }}
+              />
+              <TextWithLink
+                textBeforeLink={", Powershell, "}
+                link={{
+                  href: "https://www.putty.org/",
+                  text: "PuTTY",
+                  color: "blue.500",
+                  isExternal: true,
+                }}
+                textAfterLink={
+                  ", or cmd.exe, run the following command to connect to Lyra:"
+                }
+              />
+            </Flex>
           </InstructionText>
         </Box>
         <Box>
@@ -83,15 +99,16 @@ function JupyterHubInstructions() {
     <>
       <InstructionHeading>Connect to JupyterHub</InstructionHeading>
       <InstructionText>
-        Visit{" "}
-        <Link
-          href="https://jupyterhub.eres.qut.edu.au"
-          isExternal
-          color="blue.500"
-        >
-          https://jupyterhub.eres.qut.edu.au
-        </Link>{" "}
-        and log in with your QUT username and password.
+        <TextWithLink
+          textBeforeLink={"Visit "}
+          link={{
+            href: "https://jupyterhub.eres.qut.edu.au",
+            text: "https://jupyterhub.eres.qut.edu.au",
+            color: "blue.500",
+            isExternal: true,
+          }}
+          textAfterLink={" and log in with your QUT username and password."}
+        />
       </InstructionText>
     </>
   );
@@ -102,30 +119,42 @@ function RvdiInstructions() {
     <>
       <InstructionHeading>Connect to rVDI</InstructionHeading>
       <InstructionText>
-        See the instructions{" "}
-        <Link
-          href="https://qutvirtual4.qut.edu.au/group/research-students/conducting-research/specialty-research-facilities/advanced-research-computing-storage/virtual-workstations"
-          isExternal
-          color="blue.500"
-        >
-          here
-        </Link>{" "}
-        for more information.
+        <TextWithLink
+          textBeforeLink={"See the instructions "}
+          link={{
+            href: "https://qutvirtual4.qut.edu.au/group/research-students/conducting-research/specialty-research-facilities/advanced-research-computing-storage/virtual-workstations",
+            text: "here",
+            color: "blue.500",
+            isExternal: true,
+          }}
+          textAfterLink={" for more information."}
+        />
       </InstructionText>
       <InstructionText>
-        If you have not already, download and install the VMware Horizon client
-        from{" "}
-        <Link href="https://rvdi.qut.edu.au" isExternal color="blue.500">
-          https://rvdi.qut.edu.au
-        </Link>
-        .
+        <TextWithLink
+          textBeforeLink={
+            "If you have not already, download and install the VMware Horizon client from "
+          }
+          link={{
+            href: "https://rvdi.qut.edu.au",
+            text: "https://rvdi.qut.edu.au",
+            color: "blue.500",
+            isExternal: true,
+          }}
+          textAfterLink={"."}
+        />
       </InstructionText>
       <InstructionText>
-        In the VMware Horizon client, connect to{" "}
-        <Link href="https://rvdi.qut.edu.au" isExternal color="blue.500">
-          rvdi.qut.edu.au
-        </Link>{" "}
-        and log in with your QUT username and password.
+        <TextWithLink
+          textBeforeLink={"In the VMware Horizon client, connect to "}
+          link={{
+            href: "https://rvdi.qut.edu.au",
+            text: "https://rvdi.qut.edu.au",
+            color: "blue.500",
+            isExternal: true,
+          }}
+          textAfterLink={" and log in with your QUT username and password."}
+        />
       </InstructionText>
     </>
   );
diff --git a/src/components/tool/guide/Instructions/InstallInstructions.js b/src/components/tool/guide/Instructions/InstallInstructions.js
index 983afb20..b8864309 100644
--- a/src/components/tool/guide/Instructions/InstallInstructions.js
+++ b/src/components/tool/guide/Instructions/InstallInstructions.js
@@ -1,15 +1,8 @@
-import {
-  Alert,
-  AlertIcon,
-  Link,
-  Tab,
-  TabList,
-  TabPanel,
-  TabPanels,
-  Tabs,
-} from "@chakra-ui/react";
+import { Tab, TabList, TabPanel, TabPanels, Tabs } from "@chakra-ui/react";
 
+import TextWithLink from "../../../navigation/TextWithLink";
 import CopyBox from "../../../output/CopyBox";
+import AlertHelper from "../Config/AlertHelper";
 import InstructionHeading from "./components/InstructionHeading";
 import InstructionText from "./components/InstructionText";
 import { singularityContainerName } from "./utils";
@@ -77,15 +70,16 @@ export function InstallInstructions({
                 Install Singularity (if it has not been installed)
               </InstructionHeading>
               <InstructionText>
-                Follow the instructions{" "}
-                <Link
-                  href="https://sylabs.io/docs/"
-                  isExternal
-                  color="blue.500"
-                >
-                  here
-                </Link>{" "}
-                to install singularity.
+                <TextWithLink
+                  textBeforeLink={"Follow the instructions "}
+                  link={{
+                    href: "https://sylabs.io/docs/",
+                    text: "here",
+                    color: "blue.500",
+                    isExternal: true,
+                  }}
+                  textAfterLink={" to install singularity."}
+                />
               </InstructionText>
               <InstructionHeading>Set up the container</InstructionHeading>
               <InstructionText>Build the container:</InstructionText>
@@ -144,11 +138,11 @@ export function InstallInstructions({
                     <CopyBox>source ~/.bashrc</CopyBox>
                   </TabPanel>
                   <TabPanel>
-                    <Alert status="warning">
-                      <AlertIcon />
-                      Packages take a long time to install with conda. We
-                      recommend using mamba instead.
-                    </Alert>
+                    <AlertHelper alertType="warning" alertDismissible={false}>
+                      {
+                        "Packages take a long time to install with conda. We recommend using mamba instead."
+                      }
+                    </AlertHelper>
                     <InstructionText>
                       Download the latest version of miniconda:
                     </InstructionText>
@@ -201,15 +195,16 @@ export function InstallInstructions({
                 Install Python (if it has not been installed)
               </InstructionHeading>
               <InstructionText>
-                Follow the instructions{" "}
-                <Link
-                  href="https://www.python.org/downloads/"
-                  isExternal
-                  color="blue.500"
-                >
-                  here
-                </Link>{" "}
-                to install python.
+                <TextWithLink
+                  textBeforeLink={"Follow the instructions "}
+                  link={{
+                    href: "https://www.python.org/downloads/",
+                    text: "here",
+                    color: "blue.500",
+                    isExternal: true,
+                  }}
+                  textAfterLink={" to install python."}
+                />
               </InstructionText>
             </>
           )}
diff --git a/src/components/tool/guide/Instructions/StartInstructions.js b/src/components/tool/guide/Instructions/StartInstructions.js
index 27a9b9d3..edd79358 100644
--- a/src/components/tool/guide/Instructions/StartInstructions.js
+++ b/src/components/tool/guide/Instructions/StartInstructions.js
@@ -1,8 +1,8 @@
-import { ExternalLinkIcon } from "@chakra-ui/icons";
-import { Box, Checkbox, Code, Flex, Input, Link } from "@chakra-ui/react";
+import { Box, Checkbox, Code, Flex, Input } from "@chakra-ui/react";
 
 import { useState } from "react";
 
+import TextWithLink from "../../../navigation/TextWithLink";
 import CopyBox from "../../../output/CopyBox";
 import InstructionHeading from "./components/InstructionHeading";
 import InstructionText from "./components/InstructionText";
@@ -100,18 +100,23 @@ export function LyraStartInstructions({
             command-line argument.
           </InstructionText>
           <InstructionText>
-            Pick your favourite text editor (e.g.: <Code>nano</Code>,{" "}
-            <Code>vim</Code> or <Code>gedit</Code>). If you do not know how to
-            use text editors, please{" "}
-            <Link
-              color="teal.500"
-              href="https://qutvirtual4.qut.edu.au/group/staff/research/conducting/facilities/advanced-research-computing-storage/supercomputing/using-linux"
-              isExternal
-            >
-              refer here
-              <ExternalLinkIcon mx="2px" />
-            </Link>
-            .
+            <Flex alignItems={"center"}>
+              Pick your favourite text editor (e.g.: <Code>nano</Code>,{" "}
+              <Code>vim</Code> or <Code>gedit</Code>).
+              <TextWithLink
+                textBeforeLink={
+                  "If you do not know how to use text editors, please "
+                }
+                link={{
+                  href: "https://qutvirtual4.qut.edu.au/group/staff/research/conducting/facilities/advanced-research-computing-storage/supercomputing/using-linux",
+                  text: "refer here",
+                  color: "blue.500",
+                  isExternal: true,
+                }}
+                hasExternalIcon={true}
+                textAfterLink={"."}
+              />
+            </Flex>
           </InstructionText>
         </>
       )}
@@ -186,17 +191,19 @@ export function JupyterHubStartInstructions({ jobProfile }) {
       </InstructionText>
       <InstructionText>Wait for the to be redirected.</InstructionText>
       <InstructionText>
-        It may take up to 10 minutes for your job to be queued and for the
-        server to start. If it fails to start, please raise an incident in the{" "}
-        <Link
-          color="teal.500"
-          href="https://eresearchqut.atlassian.net/servicedesk/customer/portals"
-          isExternal
-        >
-          eResearch help centre
-          <ExternalLinkIcon mx="2px" />
-        </Link>
-        .
+        <TextWithLink
+          textBeforeLink={
+            "It may take up to 10 minutes for your job to be queued and for the server to start. If it fails to start, please raise an incident in the "
+          }
+          link={{
+            href: "https://eresearchqut.atlassian.net/servicedesk/customer/portals",
+            text: "eResearch help centre",
+            color: "blue.500",
+            isExternal: true,
+          }}
+          hasExternalIcon={true}
+          textAfterLink={"."}
+        />
       </InstructionText>
     </>
   );
diff --git a/src/components/tool/guide/Instructions/TeardownInstructions.js b/src/components/tool/guide/Instructions/TeardownInstructions.js
index f643516f..1d6f9333 100644
--- a/src/components/tool/guide/Instructions/TeardownInstructions.js
+++ b/src/components/tool/guide/Instructions/TeardownInstructions.js
@@ -1,6 +1,7 @@
-import { Alert, AlertIcon, Code, Kbd } from "@chakra-ui/react";
+import { Code, Kbd } from "@chakra-ui/react";
 
 import CopyBox from "../../../output/CopyBox";
+import AlertHelper from "../Config/AlertHelper";
 import InstructionHeading from "./components/InstructionHeading";
 import InstructionText from "./components/InstructionText";
 
@@ -14,10 +15,9 @@ export function TeardownInstructions({
     <>
       {service === "Lyra" && (
         <>
-          <Alert status="warning" variant="left-accent">
-            <AlertIcon />
-            Lyra is a shared resource, only request the resources you need.
-          </Alert>
+          <AlertHelper alertType="warning" alertDismissible={false}>
+            {"Lyra is a shared resource, only request the resources you need."}
+          </AlertHelper>
         </>
       )}
       {usingTool && (