diff --git a/packages/backend/src/api/v1/template-versions.ts b/packages/backend/src/api/v1/template-versions.ts
index 9fab7c50..09d91efe 100644
--- a/packages/backend/src/api/v1/template-versions.ts
+++ b/packages/backend/src/api/v1/template-versions.ts
@@ -38,9 +38,14 @@ versions.get("/latest", async (ctx: Context) => {
   }
 
   latestVersion.extra = unCamelObject(latestVersion.extra)
-  latestVersion.content = latestVersion.content?.map((c: any) =>
-    unCamelObject(c),
-  )
+
+  // This makes sure OpenAI messages are not camel cased as used in the app
+  // For example: message.toolCallId instead of message.tool_call_id
+  if (typeof latestVersion.content !== "string") {
+    latestVersion.content = latestVersion.content?.map((c: any) =>
+      unCamelObject(c),
+    )
+  }
 
   ctx.body = latestVersion
 })
diff --git a/packages/frontend/components/layout/Paywall.tsx b/packages/frontend/components/layout/Paywall.tsx
index 78b8aa45..56e67f9d 100644
--- a/packages/frontend/components/layout/Paywall.tsx
+++ b/packages/frontend/components/layout/Paywall.tsx
@@ -67,6 +67,11 @@ export default function Paywall({
     return children
   }
 
+  // Legacy Unlimited plan has access to all features
+  if (plan === "team" && org?.plan === "unlimited") {
+    return children
+  }
+
   const isEnterpriseFeature = plan === "enterprise"
 
   return (
diff --git a/packages/frontend/components/layout/UpgradeModal.tsx b/packages/frontend/components/layout/UpgradeModal.tsx
index a633653d..ad480157 100644
--- a/packages/frontend/components/layout/UpgradeModal.tsx
+++ b/packages/frontend/components/layout/UpgradeModal.tsx
@@ -90,6 +90,16 @@ function RenderPrice({ price, period }) {
   )
 }
 
+function AcceptedPayments() {
+  return (
+    <Group align="center" gap={11}>
+      <img height={24} src="/assets/google-pay.webp" alt="google pay" />
+      <img height={24} src="/assets/apple-pay.webp" alt="apple pay" />
+      <img height={24} src="/assets/accepted-cards.webp" alt="Accepted cards" />
+    </Group>
+  )
+}
+
 function RenderPlanCard({
   planId,
   price,
@@ -401,7 +411,7 @@ export function UpgradePlans({
             onClick={() => setShowFeatures(true)}
             leftSection={<IconArrowDown size={12} />}
           >
-            Expand features
+            View Features
           </Button>
         </Group>
       ) : (
@@ -429,31 +439,36 @@ function UpgradeModal({
       analytics.track("Upgrade Modal")
   }, [])
 
+  const { org } = useOrg()
+
   if (!process.env.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY) return null
 
   return (
-    <Container px={20} py="md" size="lg">
-      <Stack align="center" ta="center" className="unblockable">
-        {/* <IconAnalyze color={"#206dce"} size={50} /> */}
+    <Container px={0} pb="md" size="xl">
+      {/* <Stack align="center" ta="center" className="unblockable"> */}
+      {/* <IconAnalyze color={"#206dce"} size={50} /> */}
 
-        <Title order={2} fw={700} size={34} ta="center">
+      {/* <Title order={2} fw={700} size={34} ta="center">
           10x your AI's performance
         </Title>
 
         <Text size="lg" mt={0} mb="lg" fw={500}>
           {`Unlock powerful features to improve your AI's
         quality.`}
-        </Text>
-      </Stack>
-      <Divider my="xl" />
+        </Text> */}
+      {/* </Stack> */}
+      {/* <Divider my="xl" /> */}
       <UpgradePlans highlight={innerProps?.highlight} defaultExpand />
-      <Text ta="center" size="sm" mt="lg">
-        Cancel any time with just 1 click. <Mark>30 days</Mark> money-back
-        guarantee.
+      <Text ta="center" size="md" mt="lg">
+        <Mark>30 days</Mark> money-back guarantee. Cancel any time with just 1
+        click.
       </Text>
-      <Card w="fit-content" mx="auto" mt="md">
-        <SocialProof />
-      </Card>
+      <Group justify="space-between" align="center" w="100%" px="sm" mt="md">
+        <Card w="fit-content">
+          <SocialProof />
+        </Card>
+        {org?.plan === "free" && <AcceptedPayments />}
+      </Group>
     </Container>
   )
 }
diff --git a/packages/frontend/public/assets/accepted-cards.webp b/packages/frontend/public/assets/accepted-cards.webp
new file mode 100644
index 00000000..1d346fe0
Binary files /dev/null and b/packages/frontend/public/assets/accepted-cards.webp differ
diff --git a/packages/frontend/public/assets/apple-pay.webp b/packages/frontend/public/assets/apple-pay.webp
new file mode 100644
index 00000000..a7d67cf1
Binary files /dev/null and b/packages/frontend/public/assets/apple-pay.webp differ
diff --git a/packages/frontend/public/assets/google-pay.webp b/packages/frontend/public/assets/google-pay.webp
new file mode 100644
index 00000000..8951082d
Binary files /dev/null and b/packages/frontend/public/assets/google-pay.webp differ