diff --git a/components/publication-card.tsx b/components/publication-card.tsx
index c3b24042..3de6e7d2 100644
--- a/components/publication-card.tsx
+++ b/components/publication-card.tsx
@@ -17,8 +17,8 @@ import {
 } from "lucide-react";
 import Image from "next/image";
 import { useEffect, useState } from "react";
-import { TrackedLink } from "./util-tracked-link";
 import { TrackedButton } from "./util-tracked-button";
+import { TrackedLink } from "./util-tracked-link";
 
 interface Props {
   bibtexKey: string;
@@ -49,24 +49,9 @@ export function PublicationCard({
     "idle"
   );
   const [imageError, setImageError] = useState(false);
-  const [downloadUrl, setDownloadUrl] = useState<string | null>(null);
-  const [isClient, setIsClient] = useState(false);
 
-  useEffect(() => {
-    setIsClient(true);
-  }, []);
-
-  useEffect(() => {
-    return () => {
-      if (downloadUrl) {
-        URL.revokeObjectURL(downloadUrl);
-      }
-    };
-  }, [downloadUrl]);
-
-  const handleCopy = (e: React.MouseEvent) => {
-    e.stopPropagation();
-    if (isClient && navigator.clipboard?.writeText) {
+  const handleCopy = () => {
+    if (navigator.clipboard?.writeText) {
       navigator.clipboard
         .writeText(bibtex)
         .then(() => {
@@ -84,17 +69,16 @@ export function PublicationCard({
     }
   };
 
-  const handleDownload = (e: React.MouseEvent) => {
-    e.stopPropagation();
+  const handleDownload = () => {
     const blob = new Blob([bibtex], { type: "text/plain" });
     const url = URL.createObjectURL(blob);
-    setDownloadUrl(url);
     const a = document.createElement("a");
     a.href = url;
     a.download = `${bibtexKey}.bib`;
     document.body.appendChild(a);
     a.click();
     document.body.removeChild(a);
+    URL.revokeObjectURL(url); // Clean up immediately
   };
 
   const handleCardClick = () => {
@@ -133,94 +117,93 @@ export function PublicationCard({
     </>
   );
 
-    return (
-  <div
-    className={cn(
-      "cards flex items-start space-x-4 rounded-lg border p-4", 
-      url,
-      className
-    )}
-    id={bibtexKey}
-    onClick={handleCardClick}
-  >
-    <div className="pointer-events-none relative h-24 w-24 flex-shrink-0">
-      {ImageContent}
-    </div>
+  return (
+    <div
+      className={cn(
+        "cards flex items-start space-x-4 rounded-lg border p-4",
+        url,
+        className
+      )}
+      id={bibtexKey}
+      onClick={handleCardClick}
+    >
+      <div className="pointer-events-none relative h-24 w-24 flex-shrink-0">
+        {ImageContent}
+      </div>
 
-    <div className="pointer-events-none flex-grow space-y-1">
-      <CardTitle className="text-base font-medium leading-snug">
-        <span className={cn(url && "hover:underline")}>{title}</span>
-      </CardTitle>
-      <p className="text-sm text-muted-foreground">
-        {formattedAuthors}. <em>{journal}</em>. {year}
-      </p>
-    </div>
+      <div className="pointer-events-none flex-grow space-y-1">
+        <CardTitle className="text-base font-medium leading-snug">
+          <span className={cn(url && "hover:underline")}>{title}</span>
+        </CardTitle>
+        <p className="text-sm text-muted-foreground">
+          {formattedAuthors}. <em>{journal}</em>. {year}
+        </p>
+      </div>
 
-    <div className="z-10 flex flex-shrink-0 flex-col space-y-1">
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <TrackedButton
-            variant="ghost"
-            size="sm"
-            className="h-7 w-7 cursor-pointer px-2"
-            onClick={handleDownload}
-            eventName={`${bibtexKey}-bibfile`}
-          >
-            <FileText className="h-4 w-4" />
-          </TrackedButton>
-        </TooltipTrigger>
-        <TooltipContent>
-          <p>Download BibTeX</p>
-        </TooltipContent>
-      </Tooltip>
-
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <TrackedButton
-            variant="ghost"
-            size="sm"
-            className="relative h-7 w-7 cursor-pointer px-2"
-            onClick={handleCopy}
-            eventName={`${bibtexKey}-copycite`}
-          >
-            {copyStatus === "idle" && <Copy className="h-4 w-4" />}
-            {copyStatus === "success" && (
-              <Check className="h-4 w-4 text-green-500" />
-            )}
-            {copyStatus === "error" && <X className="h-4 w-4 text-red-500" />}
-          </TrackedButton>
-        </TooltipTrigger>
-        <TooltipContent>
-          <p>Copy Citation</p>
-        </TooltipContent>
-      </Tooltip>
-
-      {pdfUrl && pdfAvailable && (
+      <div className="z-10 flex flex-shrink-0 flex-col space-y-1">
         <Tooltip>
           <TooltipTrigger asChild>
-            <Button
+            <TrackedButton
               variant="ghost"
               size="sm"
-              className="h-7 w-7 px-2"
-              asChild
-              onClick={(e) => e.stopPropagation()}
+              className="h-7 w-7 cursor-pointer px-2"
+              onClick={handleDownload}
+              eventName={`${bibtexKey}-bibfile`}
             >
-              <TrackedLink
-                href={pdfUrl}
-                target="_blank"
-                eventName={`${bibtexKey}-pdf`}
-                rel="noopener noreferrer"
-              >
-                <BookOpen className="h-4 w-4" />
-              </TrackedLink>
-            </Button>
+              <FileText className="h-4 w-4" />
+            </TrackedButton>
           </TooltipTrigger>
           <TooltipContent>
-            <p>Open PDF</p>
+            <p>Download BibTeX</p>
           </TooltipContent>
         </Tooltip>
-      )}
+
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <TrackedButton
+              variant="ghost"
+              size="sm"
+              className="relative h-7 w-7 cursor-pointer px-2"
+              onClick={handleCopy}
+              eventName={`${bibtexKey}-copycite`}
+            >
+              {copyStatus === "idle" && <Copy className="h-4 w-4" />}
+              {copyStatus === "success" && (
+                <Check className="h-4 w-4 text-green-500" />
+              )}
+              {copyStatus === "error" && <X className="h-4 w-4 text-red-500" />}
+            </TrackedButton>
+          </TooltipTrigger>
+          <TooltipContent>
+            <p>Copy Citation</p>
+          </TooltipContent>
+        </Tooltip>
+
+        {pdfUrl && pdfAvailable && (
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <Button
+                variant="ghost"
+                size="sm"
+                className="h-7 w-7 px-2"
+                asChild
+              >
+                <TrackedLink
+                  href={pdfUrl}
+                  target="_blank"
+                  eventName={`${bibtexKey}-pdf`}
+                  rel="noopener noreferrer"
+                >
+                  <BookOpen className="h-4 w-4" />
+                </TrackedLink>
+              </Button>
+            </TooltipTrigger>
+            <TooltipContent>
+              <p>Open PDF</p>
+            </TooltipContent>
+          </Tooltip>
+        )}
+      </div>
     </div>
-  </div>
-);
+  );
 };
\ No newline at end of file
diff --git a/components/util-tracked-button.tsx b/components/util-tracked-button.tsx
index 9bf0b521..df4b4fad 100644
--- a/components/util-tracked-button.tsx
+++ b/components/util-tracked-button.tsx
@@ -18,6 +18,9 @@ export const TrackedButton = ({
   const handleTrackedClick = (
     e: React.MouseEvent<HTMLButtonElement, MouseEvent>
   ) => {
+
+    e.stopPropagation();
+
     if (window.umami) {
       window.umami.track(eventName);
     }
diff --git a/types/umami.d.ts b/types/umami.d.ts
new file mode 100644
index 00000000..01dfd4ac
--- /dev/null
+++ b/types/umami.d.ts
@@ -0,0 +1,11 @@
+// types/umami.d.ts
+
+declare global {
+  interface Window {
+    umami?: {
+      track: (event_name: string, data?: object) => void;
+    };
+  }
+}
+
+export {};
\ No newline at end of file