diff --git a/client/src/components/History.tsx b/client/src/components/History.tsx
index b03d1f4..0b05b55 100644
--- a/client/src/components/History.tsx
+++ b/client/src/components/History.tsx
@@ -1,5 +1,4 @@
 import { ServerNotification } from "@modelcontextprotocol/sdk/types.js";
-import { Copy } from "lucide-react";
 import { useState } from "react";
 import JsonView from "./JsonView";
 
@@ -25,10 +24,6 @@ const HistoryAndNotifications = ({
     setExpandedNotifications((prev) => ({ ...prev, [index]: !prev[index] }));
   };
 
-  const copyToClipboard = (text: string) => {
-    navigator.clipboard.writeText(text);
-  };
-
   return (
     <div className="bg-card overflow-hidden flex h-full">
       <div className="flex-1 overflow-y-auto p-4 border-r">
@@ -68,16 +63,12 @@ const HistoryAndNotifications = ({
                           <span className="font-semibold text-blue-600">
                             Request:
                           </span>
-                          <button
-                            onClick={() => copyToClipboard(request.request)}
-                            className="text-blue-500 hover:text-blue-700"
-                          >
-                            <Copy size={16} />
-                          </button>
-                        </div>
-                        <div className="bg-background p-2 rounded">
-                          <JsonView data={request.request} />
                         </div>
+
+                        <JsonView
+                          data={request.request}
+                          className="bg-background"
+                        />
                       </div>
                       {request.response && (
                         <div className="mt-2">
@@ -85,16 +76,11 @@ const HistoryAndNotifications = ({
                             <span className="font-semibold text-green-600">
                               Response:
                             </span>
-                            <button
-                              onClick={() => copyToClipboard(request.response!)}
-                              className="text-blue-500 hover:text-blue-700"
-                            >
-                              <Copy size={16} />
-                            </button>
-                          </div>
-                          <div className="bg-background p-2 rounded">
-                            <JsonView data={request.response} />
                           </div>
+                          <JsonView
+                            data={request.response}
+                            className="bg-background"
+                          />
                         </div>
                       )}
                     </>
@@ -134,20 +120,11 @@ const HistoryAndNotifications = ({
                         <span className="font-semibold text-purple-600">
                           Details:
                         </span>
-                        <button
-                          onClick={() =>
-                            copyToClipboard(JSON.stringify(notification))
-                          }
-                          className="text-blue-500 hover:text-blue-700"
-                        >
-                          <Copy size={16} />
-                        </button>
-                      </div>
-                      <div className="bg-background p-2 rounded">
-                        <JsonView
-                          data={JSON.stringify(notification, null, 2)}
-                        />
                       </div>
+                      <JsonView
+                        data={JSON.stringify(notification, null, 2)}
+                        className="bg-background"
+                      />
                     </div>
                   )}
                 </li>
diff --git a/client/src/components/JsonView.tsx b/client/src/components/JsonView.tsx
index 3b9ec25..a98a11c 100644
--- a/client/src/components/JsonView.tsx
+++ b/client/src/components/JsonView.tsx
@@ -1,11 +1,16 @@
-import { useState, memo } from "react";
+import { useState, memo, useMemo, useCallback, useEffect } from "react";
 import { JsonValue } from "./DynamicJsonForm";
 import clsx from "clsx";
+import { Copy, CheckCheck } from "lucide-react";
+import { Button } from "@/components/ui/button";
+import { useToast } from "@/hooks/use-toast";
 
 interface JsonViewProps {
   data: unknown;
   name?: string;
   initialExpandDepth?: number;
+  className?: string;
+  withCopyButton?: boolean;
 }
 
 function tryParseJson(str: string): { success: boolean; data: JsonValue } {
@@ -24,22 +29,75 @@ function tryParseJson(str: string): { success: boolean; data: JsonValue } {
 }
 
 const JsonView = memo(
-  ({ data, name, initialExpandDepth = 3 }: JsonViewProps) => {
-    const normalizedData =
-      typeof data === "string"
+  ({
+    data,
+    name,
+    initialExpandDepth = 3,
+    className,
+    withCopyButton = true,
+  }: JsonViewProps) => {
+    const { toast } = useToast();
+    const [copied, setCopied] = useState(false);
+
+    useEffect(() => {
+      let timeoutId: NodeJS.Timeout;
+      if (copied) {
+        timeoutId = setTimeout(() => {
+          setCopied(false);
+        }, 500);
+      }
+      return () => {
+        if (timeoutId) {
+          clearTimeout(timeoutId);
+        }
+      };
+    }, [copied]);
+
+    const normalizedData = useMemo(() => {
+      return typeof data === "string"
         ? tryParseJson(data).success
           ? tryParseJson(data).data
           : data
         : data;
+    }, [data]);
+
+    const handleCopy = useCallback(() => {
+      try {
+        navigator.clipboard.writeText(JSON.stringify(normalizedData, null, 2));
+        setCopied(true);
+      } catch (error) {
+        toast({
+          title: "Error",
+          description: `There was an error coping result into the clipboard: ${error instanceof Error ? error.message : String(error)}`,
+          variant: "destructive",
+        });
+      }
+    }, [toast, normalizedData]);
 
     return (
-      <div className="font-mono text-sm transition-all duration-300">
-        <JsonNode
-          data={normalizedData as JsonValue}
-          name={name}
-          depth={0}
-          initialExpandDepth={initialExpandDepth}
-        />
+      <div className={clsx("p-4 border rounded relative", className)}>
+        {withCopyButton && (
+          <Button
+            size="icon"
+            variant="ghost"
+            className="absolute top-2 right-2"
+            onClick={handleCopy}
+          >
+            {copied ? (
+              <CheckCheck className="size-4 dark:text-green-700 text-green-600" />
+            ) : (
+              <Copy className="size-4 text-foreground" />
+            )}
+          </Button>
+        )}
+        <div className="font-mono text-sm transition-all duration-300">
+          <JsonNode
+            data={normalizedData as JsonValue}
+            name={name}
+            depth={0}
+            initialExpandDepth={initialExpandDepth}
+          />
+        </div>
       </div>
     );
   },
diff --git a/client/src/components/PromptsTab.tsx b/client/src/components/PromptsTab.tsx
index b42cf77..48c847d 100644
--- a/client/src/components/PromptsTab.tsx
+++ b/client/src/components/PromptsTab.tsx
@@ -152,9 +152,7 @@ const PromptsTab = ({
                 Get Prompt
               </Button>
               {promptContent && (
-                <div className="p-4 border rounded">
-                  <JsonView data={promptContent} />
-                </div>
+                <JsonView data={promptContent} withCopyButton={false} />
               )}
             </div>
           ) : (
diff --git a/client/src/components/ResourcesTab.tsx b/client/src/components/ResourcesTab.tsx
index 443a902..2a10824 100644
--- a/client/src/components/ResourcesTab.tsx
+++ b/client/src/components/ResourcesTab.tsx
@@ -215,9 +215,10 @@ const ResourcesTab = ({
               <AlertDescription>{error}</AlertDescription>
             </Alert>
           ) : selectedResource ? (
-            <div className="bg-gray-50 dark:bg-gray-800 p-4 rounded text-sm overflow-auto max-h-96 text-gray-900 dark:text-gray-100">
-              <JsonView data={resourceContent} />
-            </div>
+            <JsonView
+              data={resourceContent}
+              className="bg-gray-50 dark:bg-gray-800 p-4 rounded text-sm overflow-auto max-h-96 text-gray-900 dark:text-gray-100"
+            />
           ) : selectedTemplate ? (
             <div className="space-y-4">
               <p className="text-sm text-gray-600">
diff --git a/client/src/components/SamplingTab.tsx b/client/src/components/SamplingTab.tsx
index 21fc7dd..a72ea7d 100644
--- a/client/src/components/SamplingTab.tsx
+++ b/client/src/components/SamplingTab.tsx
@@ -44,9 +44,11 @@ const SamplingTab = ({ pendingRequests, onApprove, onReject }: Props) => {
         <h3 className="text-lg font-semibold">Recent Requests</h3>
         {pendingRequests.map((request) => (
           <div key={request.id} className="p-4 border rounded-lg space-y-4">
-            <div className="bg-gray-50 dark:bg-gray-800 dark:text-gray-100 p-2 rounded">
-              <JsonView data={JSON.stringify(request.request)} />
-            </div>
+            <JsonView
+              className="bg-gray-50 dark:bg-gray-800 dark:text-gray-100 rounded"
+              data={JSON.stringify(request.request)}
+            />
+
             <div className="flex space-x-2">
               <Button onClick={() => handleApprove(request.id)}>Approve</Button>
               <Button variant="outline" onClick={() => onReject(request.id)}>
diff --git a/client/src/components/ToolsTab.tsx b/client/src/components/ToolsTab.tsx
index bd30f96..a9e9bf8 100644
--- a/client/src/components/ToolsTab.tsx
+++ b/client/src/components/ToolsTab.tsx
@@ -13,11 +13,10 @@ import {
   ListToolsResult,
   Tool,
 } from "@modelcontextprotocol/sdk/types.js";
-import { Copy, Send, CheckCheck } from "lucide-react";
-import { useCallback, useEffect, useState } from "react";
+import { Send } from "lucide-react";
+import { useEffect, useState } from "react";
 import ListPane from "./ListPane";
 import JsonView from "./JsonView";
-import { useToast } from "@/hooks/use-toast";
 
 const ToolsTab = ({
   tools,
@@ -39,30 +38,11 @@ const ToolsTab = ({
   nextCursor: ListToolsResult["nextCursor"];
   error: string | null;
 }) => {
-  const { toast } = useToast();
   const [params, setParams] = useState<Record<string, unknown>>({});
   useEffect(() => {
     setParams({});
   }, [selectedTool]);
 
-  const [copied, setCopied] = useState(false);
-
-  const handleCopy = useCallback(() => {
-    try {
-      navigator.clipboard.writeText(JSON.stringify(toolResult));
-      setCopied(true);
-      setTimeout(() => {
-        setCopied(false);
-      }, 500);
-    } catch (error) {
-      toast({
-        title: "Error",
-        description: `There was an error coping result into the clipboard: ${error instanceof Error ? error.message : String(error)}`,
-        variant: "destructive",
-      });
-    }
-  }, [toast, toolResult]);
-
   const renderToolResult = () => {
     if (!toolResult) return null;
 
@@ -72,15 +52,10 @@ const ToolsTab = ({
         return (
           <>
             <h4 className="font-semibold mb-2">Invalid Tool Result:</h4>
-            <div className="p-4 border rounded relative">
-              <Copy className="size-4 text-primary" />
-              <JsonView data={toolResult} />
-            </div>
+            <JsonView data={toolResult} />
             <h4 className="font-semibold mb-2">Errors:</h4>
             {parsedResult.error.errors.map((error, idx) => (
-              <div key={idx} className="p-4 border rounded">
-                <JsonView data={error} />
-              </div>
+              <JsonView data={error} key={idx} />
             ))}
           </>
         );
@@ -95,23 +70,7 @@ const ToolsTab = ({
           </h4>
           {structuredResult.content.map((item, index) => (
             <div key={index} className="mb-2">
-              {item.type === "text" && (
-                <div className="p-4 border rounded relative">
-                  <Button
-                    size="icon"
-                    variant="ghost"
-                    className="absolute top-2 right-2"
-                    onClick={handleCopy}
-                  >
-                    {copied ? (
-                      <CheckCheck className="size-4 dark:text-green-700 text-green-600" />
-                    ) : (
-                      <Copy className="size-4 text-foreground" />
-                    )}
-                  </Button>
-                  <JsonView data={item.text} />
-                </div>
-              )}
+              {item.type === "text" && <JsonView data={item.text} />}
               {item.type === "image" && (
                 <img
                   src={`data:${item.mimeType};base64,${item.data}`}
@@ -129,9 +88,7 @@ const ToolsTab = ({
                     <p>Your browser does not support audio playback</p>
                   </audio>
                 ) : (
-                  <div className="p-4 border rounded">
-                    <JsonView data={item.resource} />
-                  </div>
+                  <JsonView data={item.resource} />
                 ))}
             </div>
           ))}
@@ -141,9 +98,8 @@ const ToolsTab = ({
       return (
         <>
           <h4 className="font-semibold mb-2">Tool Result (Legacy):</h4>
-          <div className="p-4 border rounded">
-            <JsonView data={toolResult.toolResult} />
-          </div>
+
+          <JsonView data={toolResult.toolResult} />
         </>
       );
     }