diff --git a/electron/servers/nextjs/app/presentation-templates/ProductOverview/BusinessChallengesGridSlide.tsx b/electron/servers/nextjs/app/presentation-templates/ProductOverview/BusinessChallengesGridSlide.tsx
index 3426444a..56e8e510 100644
--- a/electron/servers/nextjs/app/presentation-templates/ProductOverview/BusinessChallengesGridSlide.tsx
+++ b/electron/servers/nextjs/app/presentation-templates/ProductOverview/BusinessChallengesGridSlide.tsx
@@ -9,7 +9,7 @@ const BlockSchema = z.object({
   heading: z.string().max(30).meta({
     description: "Short heading for a single block of text.",
   }),
-  body: z.string().max(100).meta({
+  body: z.string().max(80).meta({
     description: "Description text for a single block of text.",
   }),
 });
diff --git a/electron/servers/nextjs/app/presentation-templates/ProductOverview/ComparisonChartSlide.tsx b/electron/servers/nextjs/app/presentation-templates/ProductOverview/ComparisonChartSlide.tsx
index 514c1e58..5d1f5e59 100644
--- a/electron/servers/nextjs/app/presentation-templates/ProductOverview/ComparisonChartSlide.tsx
+++ b/electron/servers/nextjs/app/presentation-templates/ProductOverview/ComparisonChartSlide.tsx
@@ -122,7 +122,7 @@ function StatusIcon({
 
     return <img src={checkIconUrl} alt={checkIconAlt} className="h-[26px] w-[26px] object-contain" />;
   }
-  return <p>{status}</p>
+  return <p className="text-base ">{status}</p>
 }
 
 const ComparisonChartSlide = ({ data }: { data: Partial<SchemaType> }) => {
@@ -135,14 +135,14 @@ const ComparisonChartSlide = ({ data }: { data: Partial<SchemaType> }) => {
     checkIcon,
     crossIcon,
   } = data;
-  const safeColumns = columns && columns.length > 0 ? columns : DEFAULT_COLUMNS;
+  const safeColumns = columns && columns.length > 0 ? columns : [];
   const resolvedHighlightedColumnIndex =
     highlightedColumnIndex &&
       highlightedColumnIndex >= 1 &&
       highlightedColumnIndex <= safeColumns.length
       ? highlightedColumnIndex
       : Math.min(4, safeColumns.length);
-  const safeRows = rows && rows.length > 0 ? rows : DEFAULT_ROWS;
+  const safeRows = rows && rows.length > 0 ? rows : [];
   const normalizedRows = safeRows.map((row) => {
     const rowCells =
       "cells" in row
@@ -195,7 +195,7 @@ const ComparisonChartSlide = ({ data }: { data: Partial<SchemaType> }) => {
             }}
           >
             <div className=" " />
-            {safeColumns.map((column, index) => (
+            {safeColumns.map((column: any, index: any) => (
               <div
                 key={index}
                 className="flex  items-center p-[33px] justify-center border-r text-[20px] font-semibold  tracking-[0.2em]"
diff --git a/electron/servers/nextjs/app/presentation-templates/ProductOverview/ImageGallerySlide.tsx b/electron/servers/nextjs/app/presentation-templates/ProductOverview/ImageGallerySlide.tsx
index b14d590f..6639e3d2 100644
--- a/electron/servers/nextjs/app/presentation-templates/ProductOverview/ImageGallerySlide.tsx
+++ b/electron/servers/nextjs/app/presentation-templates/ProductOverview/ImageGallerySlide.tsx
@@ -129,7 +129,7 @@ const ImageGallerySlide = ({ data }: { data: Partial<SchemaType> }) => {
           <img
             src={bottomWideImage?.__image_url__}
             alt={bottomWideImage?.__image_prompt__}
-            className="h-[290px] w-[584px] object-cover"
+            className="h-[290px] w-[605px] object-cover"
           />
           <img
             src={bottomCenterImage?.__image_url__}
diff --git a/electron/servers/nextjs/app/presentation-templates/ProductOverview/MissionVisionSlide.tsx b/electron/servers/nextjs/app/presentation-templates/ProductOverview/MissionVisionSlide.tsx
index d3383a65..d1ff0566 100644
--- a/electron/servers/nextjs/app/presentation-templates/ProductOverview/MissionVisionSlide.tsx
+++ b/electron/servers/nextjs/app/presentation-templates/ProductOverview/MissionVisionSlide.tsx
@@ -14,7 +14,7 @@ export const Schema = z.object({
   topleftTextBlockLabel: z.string().min(3).max(20).default("MISSION").meta({
     description: "Mission section label.",
   }),
-  topleftTextBlockBody: z.string().min(40).max(98).default(
+  topleftTextBlockBody: z.string().min(40).max(90).default(
     "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore."
   ).meta({
     description: "Mission paragraph content.",
@@ -22,7 +22,7 @@ export const Schema = z.object({
   bottomleftTextBlockLabel: z.string().min(3).max(20).default("VISION").meta({
     description: "Vision section label.",
   }),
-  bottomleftTextBlockBody: z.string().min(40).max(98).default(
+  bottomleftTextBlockBody: z.string().min(40).max(90).default(
     "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore."
   ).meta({
     description: "Vision paragraph content.",
diff --git a/electron/servers/nextjs/app/presentation-templates/ProductOverview/OurServicesSlide.tsx b/electron/servers/nextjs/app/presentation-templates/ProductOverview/OurServicesSlide.tsx
index f7ba7f9d..90051b0c 100644
--- a/electron/servers/nextjs/app/presentation-templates/ProductOverview/OurServicesSlide.tsx
+++ b/electron/servers/nextjs/app/presentation-templates/ProductOverview/OurServicesSlide.tsx
@@ -7,10 +7,10 @@ export const slideLayoutDescription =
   "A slide with a title on top and a description below, and a content section containing an image and a grid of cards of text.";
 
 const CardSchema = z.object({
-  heading: z.string().max(16).meta({
+  heading: z.string().max(14).meta({
     description: "Card heading.",
   }),
-  body: z.string().max(30).meta({
+  body: z.string().max(25).meta({
     description: "Card short description.",
   }),
   isHighlighted: z.boolean().default(false).meta({
@@ -124,7 +124,7 @@ const OurServicesSlide = ({ data }: { data: Partial<SchemaType> }) => {
               }}
             >
               <p
-                className="text-[20px] font-semibold tracking-[2.074px] text-white"
+                className="text-[20px] font-semibold tracking-[4.354px] text-white"
                 style={{
                   color: card.isHighlighted
                     ? "var(--primary-text,#edf2f1)"
@@ -134,7 +134,7 @@ const OurServicesSlide = ({ data }: { data: Partial<SchemaType> }) => {
                 {card.heading}
               </p>
               <p
-                className={`${card.isHighlighted ? "text-white" : "text-[#15342DCC]"} mt-[20px] text-[28px] font-normal`}
+                className={`${card.isHighlighted ? "text-white" : "text-[#15342D]"} mt-[20px] text-[28px] font-normal`}
                 style={{
                   color: card.isHighlighted
                     ? "var(--primary-text,#edf2f1)"
diff --git a/electron/servers/nextjs/app/presentation-templates/index.tsx b/electron/servers/nextjs/app/presentation-templates/index.tsx
index 606af6cc..5265468f 100644
--- a/electron/servers/nextjs/app/presentation-templates/index.tsx
+++ b/electron/servers/nextjs/app/presentation-templates/index.tsx
@@ -484,34 +484,6 @@ export const allLayouts: TemplateWithData[] = [
 // TODO: Step 5: Combine all templates into a single array For UseCases (like the ones below)
 // For UseCases we need to combine all templates into a single array with settings
 export const templates: TemplateLayoutsWithSettings[] = [
-    {
-        id: "neo-general",
-        name: "Neo General",
-        description: neoGeneralSettings.description,
-        settings: neoGeneralSettings as TemplateGroupSettings,
-        layouts: neoGeneralTemplates,
-    },
-    {
-        id: "neo-standard",
-        name: "Neo Standard",
-        description: neoStandardSettings.description,
-        settings: neoStandardSettings as TemplateGroupSettings,
-        layouts: neoStandardTemplates,
-    },
-    {
-        id: "neo-modern",
-        name: "Neo Modern",
-        description: neoModernSettings.description,
-        settings: neoModernSettings as TemplateGroupSettings,
-        layouts: neoModernTemplates,
-    },
-    {
-        id: "neo-swift",
-        name: "Neo Swift",
-        description: neoSwiftSettings.description,
-        settings: neoSwiftSettings as TemplateGroupSettings,
-        layouts: neoSwiftTemplates,
-    },
     {
         id: "general",
         name: "General",
@@ -568,6 +540,36 @@ export const templates: TemplateLayoutsWithSettings[] = [
         settings: reportSettings as TemplateGroupSettings,
         layouts: reportTemplates,
     },
+    {
+        id: "neo-general",
+        name: "Neo General",
+        description: neoGeneralSettings.description,
+        settings: neoGeneralSettings as TemplateGroupSettings,
+        layouts: neoGeneralTemplates,
+    },
+    {
+        id: "neo-standard",
+        name: "Neo Standard",
+        description: neoStandardSettings.description,
+        settings: neoStandardSettings as TemplateGroupSettings,
+        layouts: neoStandardTemplates,
+    },
+    {
+        id: "neo-modern",
+        name: "Neo Modern",
+        description: neoModernSettings.description,
+        settings: neoModernSettings as TemplateGroupSettings,
+        layouts: neoModernTemplates,
+    },
+    {
+        id: "neo-swift",
+        name: "Neo Swift",
+        description: neoSwiftSettings.description,
+        settings: neoSwiftSettings as TemplateGroupSettings,
+        layouts: neoSwiftTemplates,
+    },
+
+
 ];
 
 // Helper to get templates by group ID