diff --git a/deployment/knative/KNATIVE_SCALE_TO_ZERO.md b/deployment/knative/KNATIVE_SCALE_TO_ZERO.md
index fb4f3b474..18e3a07e0 100644
--- a/deployment/knative/KNATIVE_SCALE_TO_ZERO.md
+++ b/deployment/knative/KNATIVE_SCALE_TO_ZERO.md
@@ -281,4 +281,4 @@ If you need to revert to a standard Kubernetes Deployment:
 - [Knative Autoscaling](https://knative.dev/docs/serving/autoscaling/)
 - [Knative Installation Guide](https://knative.dev/docs/install/)
 - [OpenShift Serverless Documentation](https://docs.openshift.com/serverless/)
-- [Kubernetes Secrets](https://kubernetes.io/docs/concepts/configuration/secret/)
\ No newline at end of file
+- [Kubernetes Secrets](https://kubernetes.io/docs/concepts/configuration/secret/)
diff --git a/deployment/knative/knative-serving.yaml b/deployment/knative/knative-serving.yaml
index 38d289b2d..369678027 100644
--- a/deployment/knative/knative-serving.yaml
+++ b/deployment/knative/knative-serving.yaml
@@ -75,4 +75,3 @@ spec:
       metrics.backend-destination: "prometheus"
       # Enable profiling
       profiling.enable: "false"
-
diff --git a/mcpgateway/services/plugin_service.py b/mcpgateway/services/plugin_service.py
index 96ce9ce4f..73cb5fb78 100644
--- a/mcpgateway/services/plugin_service.py
+++ b/mcpgateway/services/plugin_service.py
@@ -73,9 +73,9 @@ def get_all_plugins(self) -> List[Dict[str, Any]]:
                 "description": plugin_config.description if plugin_config and plugin_config.description else "",
                 "author": plugin_config.author if plugin_config and plugin_config.author else "Unknown",
                 "version": plugin_config.version if plugin_config and plugin_config.version else "0.0.0",
-                "mode": plugin_ref.mode.value if plugin_ref.mode else "disabled",
+                "mode": plugin_ref.mode if isinstance(plugin_ref.mode, str) else plugin_ref.mode.value if plugin_ref.mode else "disabled",
                 "priority": plugin_ref.priority,
-                "hooks": [hook.value for hook in plugin_ref.hooks] if plugin_ref.hooks else [],
+                "hooks": [hook if isinstance(hook, str) else hook.value for hook in plugin_ref.hooks] if plugin_ref.hooks else [],
                 "tags": plugin_ref.tags or [],
                 "kind": plugin_config.kind if plugin_config and plugin_config.kind else "",
                 "namespace": plugin_config.namespace if plugin_config and plugin_config.namespace else "",
@@ -106,9 +106,9 @@ def get_all_plugins(self) -> List[Dict[str, Any]]:
                         "description": plugin_config.description or "",
                         "author": plugin_config.author or "Unknown",
                         "version": plugin_config.version or "0.0.0",
-                        "mode": plugin_config.mode.value,
+                        "mode": plugin_config.mode if isinstance(plugin_config.mode, str) else plugin_config.mode.value,
                         "priority": plugin_config.priority or 100,
-                        "hooks": [hook.value for hook in plugin_config.hooks] if plugin_config.hooks else [],
+                        "hooks": [hook if isinstance(hook, str) else hook.value for hook in plugin_config.hooks] if plugin_config.hooks else [],
                         "tags": plugin_config.tags or [],
                         "kind": plugin_config.kind or "",
                         "namespace": plugin_config.namespace or "",
@@ -151,9 +151,9 @@ def get_plugin_by_name(self, name: str) -> Optional[Dict[str, Any]]:
             "description": plugin_config.description if plugin_config and plugin_config.description else "",
             "author": plugin_config.author if plugin_config and plugin_config.author else "Unknown",
             "version": plugin_config.version if plugin_config and plugin_config.version else "0.0.0",
-            "mode": plugin_ref.mode.value if plugin_ref.mode else "disabled",
+            "mode": plugin_ref.mode if isinstance(plugin_ref.mode, str) else plugin_ref.mode.value if plugin_ref.mode else "disabled",
             "priority": plugin_ref.priority,
-            "hooks": [hook.value for hook in plugin_ref.hooks] if plugin_ref.hooks else [],
+            "hooks": [hook if isinstance(hook, str) else hook.value for hook in plugin_ref.hooks] if plugin_ref.hooks else [],
             "tags": plugin_ref.tags or [],
             "kind": plugin_config.kind if plugin_config and plugin_config.kind else "",
             "namespace": plugin_config.namespace if plugin_config and plugin_config.namespace else "",
diff --git a/mcpgateway/templates/admin.html b/mcpgateway/templates/admin.html
index 174a83d30..0046a917f 100644
--- a/mcpgateway/templates/admin.html
+++ b/mcpgateway/templates/admin.html
@@ -361,7 +361,7 @@
           </div>
         </div>
 
-        
+
       </header>
 
       <!-- Global notification container for flash messages -->
@@ -3502,7 +3502,7 @@ <h2 class="text-2xl font-bold dark:text-gray-200">MCP Prompts</h2>
           <div id="prompts-pagination-controls"></div>
         </div>
 
-        
+
 
         <div class="bg-white shadow rounded-lg p-6 dark:bg-gray-800">
           <h3 class="text-lg font-bold mb-4 dark:text-gray-200">
diff --git a/mcpgateway/templates/prompts_partial.html b/mcpgateway/templates/prompts_partial.html
index b03086fef..ff3b2914e 100644
--- a/mcpgateway/templates/prompts_partial.html
+++ b/mcpgateway/templates/prompts_partial.html
@@ -26,8 +26,20 @@
   <td class="px-6 py-4 whitespace-nowrap text-sm w-12"><div class="relative group">{% set enabled = prompt.is_active %}<span class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full {% if enabled %}bg-green-100 text-green-800{% else %}bg-red-100 text-red-800{% endif %}">{% if enabled %}Active{% else %}Inactive{% endif %}</span></div></td>
     <td class="px-6 py-4 whitespace-nowrap text-sm font-medium">
       <div class="grid grid-cols-2 gap-x-2 gap-y-0 max-w-48">
+        <!-- Row 1: Test -->
+        <button
+          onclick="testPrompt('{{ prompt.id }}')"
+          class="col-span-2 flex items-center justify-center px-2 py-1 text-xs font-medium rounded-md text-purple-600 hover:text-purple-900 hover:bg-purple-50 dark:text-purple-400 dark:hover:bg-purple-900/20 transition-colors"
+          x-tooltip="'💡Test this Prompt with sample arguments'"
+        >
+          Test
+        </button>
+
+        <!-- Row 2: View | Edit -->
         <button onclick="viewPrompt('{{ prompt.id }}')" class="flex items-center justify-center px-2 py-1 text-xs font-medium rounded-md text-indigo-600 hover:text-indigo-900 hover:bg-indigo-50 dark:text-indigo-400 dark:hover:bg-indigo-900/20 transition-colors">View</button>
         <button onclick="editPrompt('{{ prompt.id }}')" class="flex items-center justify-center px-2 py-1 text-xs font-medium rounded-md text-green-600 hover:text-green-900 hover:bg-green-50 dark:text-green-400 dark:hover:bg-green-900/20 transition-colors">Edit</button>
+
+        <!-- Row 3 & 4: Activate/Deactivate | Delete -->
         <div class="col-span-2 flex flex-col space-y-1">
           <form method="POST" action="{{ root_path }}/admin/prompts/{{ prompt.id }}/toggle" class="contents" onsubmit="return handleToggleSubmit(event, 'prompts')">
             <input type="hidden" name="activate" value="{{ 'false' if prompt.is_active else 'true' }}" />