diff --git a/messages/en-US.json b/messages/en-US.json
index ffe0702d..410d1414 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -2312,5 +2312,6 @@
     "organizationLoginPageDescription": "Customize the login page for this organization",
     "resourceLoginPageTitle": "Resource Login Page",
     "resourceLoginPageDescription": "Customize the login page for individual resources",
-    "enterConfirmation": "Enter confirmation"
+    "enterConfirmation": "Enter confirmation",
+    "blueprintViewDetails": "Details"
 }
diff --git a/src/components/BlueprintDetailsForm.tsx b/src/components/BlueprintDetailsForm.tsx
index ae6d5cb1..92b6a304 100644
--- a/src/components/BlueprintDetailsForm.tsx
+++ b/src/components/BlueprintDetailsForm.tsx
@@ -52,8 +52,14 @@ export default function BlueprintDetailsForm({
         <Form {...form}>
             <div className="flex flex-col gap-6">
                 <Alert>
-                    <AlertDescription>
-                        <InfoSections cols={3}>
+                    <AlertDescription className="space-y-2">
+                        <InfoSections cols={4}>
+                            <InfoSection>
+                                <InfoSectionTitle>{t("name")}</InfoSectionTitle>
+                                <InfoSectionContent>
+                                    {blueprint.name}
+                                </InfoSectionContent>
+                            </InfoSection>
                             <InfoSection>
                                 <InfoSectionTitle>
                                     {t("status")}
@@ -121,6 +127,8 @@ export default function BlueprintDetailsForm({
                                     </time>
                                 </InfoSectionContent>
                             </InfoSection>
+                        </InfoSections>
+                        <InfoSections cols={1}>
                             {blueprint.message && (
                                 <InfoSection>
                                     <InfoSectionTitle>
@@ -138,60 +146,39 @@ export default function BlueprintDetailsForm({
                 </Alert>
                 <SettingsContainer>
                     <SettingsSection>
-                        <SettingsSectionHeader>
-                            <SettingsSectionTitle>
-                                {t("blueprintInfo")}
-                            </SettingsSectionTitle>
-                        </SettingsSectionHeader>
                         <SettingsSectionBody>
-                            <SettingsSectionForm className="max-w-2xl">
-                                <FormField
-                                    control={form.control}
-                                    name="name"
-                                    render={({ field }) => (
-                                        <FormItem>
-                                            <FormLabel>{t("name")}</FormLabel>
-                                            <FormControl>
-                                                <Input {...field} />
-                                            </FormControl>
-                                            <FormMessage />
-                                        </FormItem>
-                                    )}
-                                />
-
-                                <FormField
-                                    control={form.control}
-                                    name="contents"
-                                    render={({ field }) => (
-                                        <FormItem>
-                                            <FormLabel>
-                                                {t("parsedContents")}
-                                            </FormLabel>
-                                            <FormControl>
-                                                <div
-                                                    className={cn(
-                                                        "resize-y h-64 min-h-64 overflow-y-auto overflow-x-clip max-w-full rounded-md"
-                                                    )}
-                                                >
-                                                    <Editor
-                                                        className="w-full h-full max-w-full"
-                                                        language="yaml"
-                                                        theme="vs-dark"
-                                                        options={{
-                                                            minimap: {
-                                                                enabled: false
-                                                            },
-                                                            readOnly: true
-                                                        }}
-                                                        {...field}
-                                                    />
-                                                </div>
-                                            </FormControl>
-                                            <FormMessage />
-                                        </FormItem>
-                                    )}
-                                />
-                            </SettingsSectionForm>
+                            <FormField
+                                control={form.control}
+                                name="contents"
+                                render={({ field }) => (
+                                    <FormItem>
+                                        <FormLabel>
+                                            {t("parsedContents")}
+                                        </FormLabel>
+                                        <FormControl>
+                                            <div
+                                                className={cn(
+                                                    "resize-y h-64 min-h-128 overflow-y-auto overflow-x-clip max-w-full rounded-md"
+                                                )}
+                                            >
+                                                <Editor
+                                                    className="w-full h-full max-w-full"
+                                                    language="yaml"
+                                                    theme="vs-dark"
+                                                    options={{
+                                                        minimap: {
+                                                            enabled: false
+                                                        },
+                                                        readOnly: true
+                                                    }}
+                                                    {...field}
+                                                />
+                                            </div>
+                                        </FormControl>
+                                        <FormMessage />
+                                    </FormItem>
+                                )}
+                            />
                         </SettingsSectionBody>
                     </SettingsSection>
                 </SettingsContainer>
diff --git a/src/components/BlueprintsTable.tsx b/src/components/BlueprintsTable.tsx
index 0fa05d75..8031e506 100644
--- a/src/components/BlueprintsTable.tsx
+++ b/src/components/BlueprintsTable.tsx
@@ -32,35 +32,6 @@ export default function BlueprintsTable({ blueprints, orgId }: Props) {
     const router = useRouter();
 
     const columns: ExtendedColumnDef<BlueprintRow>[] = [
-        {
-            accessorKey: "createdAt",
-            friendlyName: t("appliedAt"),
-            header: ({ column }) => {
-                return (
-                    <Button
-                        variant="ghost"
-                        onClick={() =>
-                            column.toggleSorting(column.getIsSorted() === "asc")
-                        }
-                    >
-                        {t("appliedAt")}
-                        <ArrowUpDown className="ml-2 size-4" />
-                    </Button>
-                );
-            },
-            cell: ({ row }) => {
-                return (
-                    <time
-                        className="text-muted-foreground"
-                        dateTime={row.original.createdAt.toString()}
-                    >
-                        {new Date(
-                            row.original.createdAt * 1000
-                        ).toLocaleString()}
-                    </time>
-                );
-            }
-        },
         {
             accessorKey: "name",
             enableHiding: false,
@@ -79,7 +50,32 @@ export default function BlueprintsTable({ blueprints, orgId }: Props) {
                 );
             }
         },
-
+        {
+            accessorKey: "createdAt",
+            friendlyName: t("appliedAt"),
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("appliedAt")}
+                        <ArrowUpDown className="ml-2 size-4" />
+                    </Button>
+                );
+            },
+            cell: ({ row }) => {
+                return (
+                    <time dateTime={row.original.createdAt.toString()}>
+                        {new Date(
+                            row.original.createdAt * 1000
+                        ).toLocaleString()}
+                    </time>
+                );
+            }
+        },
         {
             accessorKey: "source",
             friendlyName: t("source"),
@@ -104,7 +100,7 @@ export default function BlueprintsTable({ blueprints, orgId }: Props) {
                             <Badge variant="secondary">
                                 <span className="inline-flex items-center gap-1 ">
                                     API
-                                    <Webhook className="size-4 flex-none" />
+                                    <Webhook className="w-3 h-3 flex-none" />
                                 </span>
                             </Badge>
                         );
@@ -114,7 +110,7 @@ export default function BlueprintsTable({ blueprints, orgId }: Props) {
                             <Badge variant="secondary">
                                 <span className="inline-flex items-center gap-1 ">
                                     Newt CLI
-                                    <Terminal className="size-4 flex-none" />
+                                    <Terminal className="w-3 h-3 flex-none" />
                                 </span>
                             </Badge>
                         );
@@ -174,7 +170,7 @@ export default function BlueprintsTable({ blueprints, orgId }: Props) {
                             href={`/${orgId}/settings/blueprints/${row.original.blueprintId}`}
                         >
                             <Button variant="outline" className="items-center">
-                                View Details
+                                {t("blueprintViewDetails")}
                                 <ArrowRight className="ml-2 w-4 h-4" />
                             </Button>
                         </Link>
diff --git a/src/components/CreateBlueprintForm.tsx b/src/components/CreateBlueprintForm.tsx
index 617f3026..2b58f34f 100644
--- a/src/components/CreateBlueprintForm.tsx
+++ b/src/components/CreateBlueprintForm.tsx
@@ -127,7 +127,7 @@ export default function CreateBlueprintForm({
                             </SettingsSectionTitle>
                         </SettingsSectionHeader>
                         <SettingsSectionBody>
-                            <SettingsSectionForm className="max-w-2xl">
+                            <SettingsSectionForm>
                                 <FormField
                                     control={form.control}
                                     name="name"
@@ -141,44 +141,40 @@ export default function CreateBlueprintForm({
                                         </FormItem>
                                     )}
                                 />
-
-                                <FormField
-                                    control={form.control}
-                                    name="contents"
-                                    render={({ field }) => (
-                                        <FormItem>
-                                            <FormLabel>
-                                                {t("contents")}
-                                            </FormLabel>
-                                            <FormDescription>
-                                                {t(
-                                                    "blueprintContentsDescription"
-                                                )}
-                                            </FormDescription>
-                                            <FormControl>
-                                                <div
-                                                    className={cn(
-                                                        "resize-y h-64 min-h-64 overflow-y-auto overflow-x-clip max-w-full rounded-md"
-                                                    )}
-                                                >
-                                                    <Editor
-                                                        className="w-full h-full max-w-full"
-                                                        language="yaml"
-                                                        theme="vs-dark"
-                                                        options={{
-                                                            minimap: {
-                                                                enabled: false
-                                                            }
-                                                        }}
-                                                        {...field}
-                                                    />
-                                                </div>
-                                            </FormControl>
-                                            <FormMessage />
-                                        </FormItem>
-                                    )}
-                                />
                             </SettingsSectionForm>
+
+                            <FormField
+                                control={form.control}
+                                name="contents"
+                                render={({ field }) => (
+                                    <FormItem>
+                                        <FormLabel>{t("contents")}</FormLabel>
+                                        <FormDescription>
+                                            {t("blueprintContentsDescription")}
+                                        </FormDescription>
+                                        <FormControl>
+                                            <div
+                                                className={cn(
+                                                    "resize-y h-64 min-h-128 overflow-y-auto overflow-x-clip max-w-full rounded-md"
+                                                )}
+                                            >
+                                                <Editor
+                                                    className="w-full h-full max-w-full"
+                                                    language="yaml"
+                                                    theme="vs-dark"
+                                                    options={{
+                                                        minimap: {
+                                                            enabled: false
+                                                        }
+                                                    }}
+                                                    {...field}
+                                                />
+                                            </div>
+                                        </FormControl>
+                                        <FormMessage />
+                                    </FormItem>
+                                )}
+                            />
                         </SettingsSectionBody>
                     </SettingsSection>