diff --git a/packages/frontend/components/Layout/UpgradeModal.tsx b/packages/frontend/components/Layout/UpgradeModal.tsx
index ed1e8f54..301fb5cb 100644
--- a/packages/frontend/components/Layout/UpgradeModal.tsx
+++ b/packages/frontend/components/Layout/UpgradeModal.tsx
@@ -202,6 +202,7 @@ export function UpgradePlans({ highlight }: { highlight?: string }) {
                   { id: "team", title: "4 team members" },
                   { id: "projects", title: "Unlimited Projects" },
                   { id: "analytics", title: "Advanced Analytics" },
+                  { id: "playground", title: "Template Playground" },
                   { id: "export", title: "Exports & API" },
                 ]}
                 highlight={highlight}
@@ -250,9 +251,8 @@ export function UpgradePlans({ highlight }: { highlight?: string }) {
             features={[
               { id: "events", title: "Unlimited events" },
               { id: "team", title: "10 team members" },
-              { id: "playground", title: "Unlimited Playground" },
               { id: "evaluate", title: "Evaluations" },
-              { id: "radar", title: "Radar & Alerts" },
+              { id: "radar", title: "Radars & Alerts" },
               { id: "support", title: "Shared Slack channel" },
             ]}
             highlight={highlight}
@@ -284,7 +284,7 @@ export function UpgradePlans({ highlight }: { highlight?: string }) {
           </Group>
           <Button
             component="a"
-            href="https://lunary.ai/pricing/self-hosted"
+            href="https://lunary.ai/pricing"
             target="_blank"
             variant="gradient"
             color="teal"
diff --git a/packages/frontend/components/Prompts/PromptEditor.tsx b/packages/frontend/components/Prompts/PromptEditor.tsx
index 71554f4b..27d92648 100644
--- a/packages/frontend/components/Prompts/PromptEditor.tsx
+++ b/packages/frontend/components/Prompts/PromptEditor.tsx
@@ -17,6 +17,7 @@ export function PromptEditor({
         value={value ?? ""}
         onChange={(e) => onChange(e.currentTarget.value)}
         minRows={5}
+        mb="lg"
         autosize
       />
     )
diff --git a/packages/frontend/pages/prompts/[[...id]].tsx b/packages/frontend/pages/prompts/[[...id]].tsx
index 644489a7..fa93802a 100644
--- a/packages/frontend/pages/prompts/[[...id]].tsx
+++ b/packages/frontend/pages/prompts/[[...id]].tsx
@@ -306,14 +306,14 @@ function Playground() {
   const runPlayground = async () => {
     const model = template.extra?.model
 
+    if (org?.plan === "free" || !org?.playAllowance) {
+      return openUpgrade("playground")
+    }
+
     analytics.track("RunPlayground", {
       model,
     })
 
-    if (!org?.playAllowance) {
-      return openUpgrade("playground")
-    }
-
     setError(null)
     setOutput(null)
     setOutputTokens(0)
@@ -380,7 +380,12 @@ function Playground() {
   useEffect(() => {
     setOutput(null)
     setOutputTokens(0)
-  }, [template?.id, templateVersion?.id])
+  }, [
+    template?.id,
+    templateVersion?.id,
+    template?.mode,
+    templateVersion?.extra?.model,
+  ])
 
   const switchTemplateVersion = (v) => {
     setTemplateVersion(v)
@@ -500,6 +505,7 @@ function Playground() {
               value={
                 <SegmentedControl
                   size="xs"
+                  disabled={loading || !templateVersion?.isDraft}
                   data={[
                     {
                       value: "openai",