diff --git a/comps/custom/Detail.tsx b/comps/custom/Detail.tsx
index f113b33..5fe6cfe 100755
--- a/comps/custom/Detail.tsx
+++ b/comps/custom/Detail.tsx
@@ -84,6 +84,7 @@ export const Detail: FC<{
     local.status = "ready";
   }
 
+  if (typeof values !== "object" || values === null) return null;
   const entries = Object.entries(values);
   return (
     <div
diff --git a/comps/form/Field.tsx b/comps/form/Field.tsx
index 6a3e73e..7cce81a 100755
--- a/comps/form/Field.tsx
+++ b/comps/form/Field.tsx
@@ -298,6 +298,7 @@ export const Field: FC<{
                   />
                 )}
 
+
                 {type === "radio" && (
                   <Radio
                     name={name}
diff --git a/comps/form/Form.tsx b/comps/form/Form.tsx
index e910382..b1f087b 100755
--- a/comps/form/Form.tsx
+++ b/comps/form/Form.tsx
@@ -243,6 +243,7 @@ export const Form: FC<{
             }
           }}
           className={cx(
+            "c-w-full c-h-full c-flex-1 c-flex",
             local.layout === "unknown" && "c-hidden",
             local.layout === "2-col" &&
               css`