diff --git a/contracts/stream_contract/src/events.rs b/contracts/stream_contract/src/events.rs
index bd2f18d1..944411b8 100644
--- a/contracts/stream_contract/src/events.rs
+++ b/contracts/stream_contract/src/events.rs
@@ -106,7 +106,6 @@ pub struct AdminTransferredEvent {
     pub new_admin: Address,
 }
 
-/// Emitted when a stream is paused.
 /// Emitted when a sender pauses an active stream.
 ///
 /// Topic: `("stream_paused", stream_id)`
diff --git a/frontend/src/components/TransactionTracker.tsx b/frontend/src/components/TransactionTracker.tsx
index 370157fe..eed3978c 100644
--- a/frontend/src/components/TransactionTracker.tsx
+++ b/frontend/src/components/TransactionTracker.tsx
@@ -4,6 +4,7 @@ import React, { useEffect, useState, useCallback } from "react";
 import { Loader2, CheckCircle, XCircle, ExternalLink, RefreshCw, Clock, Ban, FileSearch } from "lucide-react";
 import toast from "react-hot-toast";
 import type { BackendStream } from "@/lib/api-types";
+import { formatAmount } from "@/utils/amount";
 
 /**
  * TransactionTracker - Shared component for tracking on-chain transaction lifecycle
@@ -426,14 +427,6 @@ function renderChanges(prev: BackendStream, current: BackendStream) {
   return changes;
 }
 
-// Helper to format amounts
-function formatAmount(raw: bigint, decimals: number): string {
-  const divisor = BigInt(10 ** decimals);
-  const whole = raw / divisor;
-  const fraction = (raw % divisor).toString().padStart(decimals, "0").replace(/0+$/, "");
-  return fraction ? `${whole}.${fraction}` : whole.toString();
-}
-
 // Hook for using transaction tracker in components
 export function useTransactionTracker() {
   const [status, setStatus] = useState<TransactionStatus>("idle");
diff --git a/frontend/src/components/dashboard/StreamDetailsModal.tsx b/frontend/src/components/dashboard/StreamDetailsModal.tsx
index 66acdce0..e960fc21 100644
--- a/frontend/src/components/dashboard/StreamDetailsModal.tsx
+++ b/frontend/src/components/dashboard/StreamDetailsModal.tsx
@@ -26,7 +26,7 @@ export const StreamDetailsModal: React.FC<StreamDetailsModalProps> = ({
         return () => window.removeEventListener("keydown", handleEscape);
     }, [onClose]);
 
-    const progress = (stream.withdrawn / stream.deposited) * 100;
+    const progress = stream.deposited > 0 ? Math.min(100, Math.max(0, (stream.withdrawn / stream.deposited) * 100)) : 0;
     const remaining = stream.deposited - stream.withdrawn;
 
     return (
@@ -45,6 +45,7 @@ export const StreamDetailsModal: React.FC<StreamDetailsModalProps> = ({
                     </div>
                     <button
                         onClick={onClose}
+                        aria-label="Close"
                         className="p-2 rounded-full hover:bg-white/10 text-slate-400 transition-colors"
                     >
                         <svg className="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
diff --git a/frontend/src/components/ui/Button.tsx b/frontend/src/components/ui/Button.tsx
index 80abe340..20f84b4c 100644
--- a/frontend/src/components/ui/Button.tsx
+++ b/frontend/src/components/ui/Button.tsx
@@ -38,29 +38,34 @@ export const Button: React.FC<ButtonProps> = ({
         <button
             className={`${baseStyles} ${variants[variant]} ${sizes[size]} ${glowStyles} ${className}`}
             disabled={disabled || loading}
+            aria-busy={loading}
             {...props}
         >
             {loading && (
-                <svg
-                    className="animate-spin -ml-1 mr-2 h-4 w-4 text-current"
-                    xmlns="http://www.w3.org/2000/svg"
-                    fill="none"
-                    viewBox="0 0 24 24"
-                >
-                    <circle
-                        className="opacity-25"
-                        cx="12"
-                        cy="12"
-                        r="10"
-                        stroke="currentColor"
-                        strokeWidth="4"
-                    />
-                    <path
-                        className="opacity-75"
-                        fill="currentColor"
-                        d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
-                    />
-                </svg>
+                <>
+                    <svg
+                        aria-hidden="true"
+                        className="animate-spin -ml-1 mr-2 h-4 w-4 text-current"
+                        xmlns="http://www.w3.org/2000/svg"
+                        fill="none"
+                        viewBox="0 0 24 24"
+                    >
+                        <circle
+                            className="opacity-25"
+                            cx="12"
+                            cy="12"
+                            r="10"
+                            stroke="currentColor"
+                            strokeWidth="4"
+                        />
+                        <path
+                            className="opacity-75"
+                            fill="currentColor"
+                            d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+                        />
+                    </svg>
+                    <span className="sr-only">Loading</span>
+                </>
             )}
             {children}
         </button>