diff --git a/src/components/CustomSearch/CompleteSearchSummary.jsx b/src/components/CustomSearch/CompleteSearchSummary.jsx
index e08225c..d61a0bb 100644
--- a/src/components/CustomSearch/CompleteSearchSummary.jsx
+++ b/src/components/CustomSearch/CompleteSearchSummary.jsx
@@ -51,7 +51,7 @@ export default function CompleteSearchSummary({ search }) {
 
   const searchType = search.searchType === "em2lm" ? "LM" : "EM";
 
-  function copyAlignment() {
+  const copyAlignment = () => {
     setIsCopying(true);
     API.post("SearchAPI", "/copy_alignment", {
       body: {
@@ -65,13 +65,11 @@ export default function CompleteSearchSummary({ search }) {
   }
 
   const searchMessage = search.errorMessage ? (
-    <>
-      <span style={{ color: "red" }}>
-        <WarningOutlined style={{ color: "#f00", fontSize: "1.5em" }} /> Search
-        failed. <br />
-        Please try again.
-      </span>
-    </>
+    <span style={{ color: "red" }}>
+      <WarningOutlined style={{ color: "#f00", fontSize: "1.5em" }} /> Search
+      failed. <br />
+      Please try again.
+    </span>
   ) : (
     <Link to={searchLink} disabled={Boolean(search.errorMessage)}>
       {search.nTotalMatches} {searchType} matches
diff --git a/src/components/CustomSearch/CompleteStep.jsx b/src/components/CustomSearch/CompleteStep.jsx
index 82e5d21..fbffb54 100644
--- a/src/components/CustomSearch/CompleteStep.jsx
+++ b/src/components/CustomSearch/CompleteStep.jsx
@@ -6,6 +6,16 @@ import StepTitle from "./StepTitle";
 
 export default function CompleteStep({ state, matches, resultsUrl }) {
   let content = "";
+
+  const handleView = () => {
+    if (Object.prototype.hasOwnProperty.call(window, 'fathom')) {
+    // make sure the fathom code has been loaded and not blocked by an ad blocker.
+      if (window.fathom) {
+        window.fathom.trackGoal('view complete results', 0);
+      }
+    }
+  };
+
   if (["complete"].includes(state)) {
     content = (
       <>
@@ -21,7 +31,7 @@ export default function CompleteStep({ state, matches, resultsUrl }) {
         >
           {matches} matches found
         </Link>
-        <Button type="primary" style={{ width: "150px", marginTop: "0.5em" }}>
+      <Button type="primary" style={{ width: "150px", marginTop: "0.5em" }} onClick={handleView}>
           <Link to={resultsUrl} >
             View
           </Link>
diff --git a/src/components/CustomSearch/ImageAlignmentStep.jsx b/src/components/CustomSearch/ImageAlignmentStep.jsx
index 9886542..66c60dd 100644
--- a/src/components/CustomSearch/ImageAlignmentStep.jsx
+++ b/src/components/CustomSearch/ImageAlignmentStep.jsx
@@ -32,6 +32,16 @@ export default function ImageAlignmentStep({ state, search }) {
     }
   }, [search.searchDir, search.uploadThumbnail]);
 
+  const handleQualityCheck = () => {
+    if (Object.prototype.hasOwnProperty.call(window, 'fathom')) {
+      // make sure the fathom code has been loaded and not blocked by an ad blocker.
+      if (window.fathom) {
+        window.fathom.trackGoal('View Alignment Quality check', 0);
+      }
+    }
+  };
+
+
   let content = "";
   if (["complete"].includes(state)) {
     const imgClass =
@@ -50,7 +60,7 @@ export default function ImageAlignmentStep({ state, search }) {
           Score: {search.alignmentScore || "N/A"}
         </span>
         {movieUrl ? (
-          <a href={movieUrl}>
+          <a href={movieUrl} onClick={handleQualityCheck}>
            <FontAwesomeIcon size="lg" icon={faFileVideo} /> Alignment Quality Check
           </a>
         ) : (
diff --git a/src/components/CustomSearch/MaskSelectionStep.jsx b/src/components/CustomSearch/MaskSelectionStep.jsx
index cbf26e5..9118854 100644
--- a/src/components/CustomSearch/MaskSelectionStep.jsx
+++ b/src/components/CustomSearch/MaskSelectionStep.jsx
@@ -27,6 +27,13 @@ export default function MaskSelectionStep({ search, state }) {
   }, [search.searchMask, search.searchDir]);
 
   const copyAlignment = () => {
+    if (Object.prototype.hasOwnProperty.call(window, 'fathom')) {
+      // make sure the fathom code has been loaded and not blocked by an ad blocker.
+      if (window.fathom) {
+        window.fathom.trackGoal('Re-select mask', 0);
+      }
+    }
+
     setIsCopying(true);
     API.post("SearchAPI", "/copy_alignment", {
       body: {