diff --git a/comps/form/field/type/FilePreview.tsx b/comps/form/field/type/FilePreview.tsx
index af168d8..60d1085 100755
--- a/comps/form/field/type/FilePreview.tsx
+++ b/comps/form/field/type/FilePreview.tsx
@@ -309,7 +309,7 @@ export const ImgThumb = ({
         "img-thumb",
         className,
         css`
-          width: ${w}px;
+          width: ${w}px; 
           height: ${h}px;
           background-image: linear-gradient(45deg, #ccc 25%, transparent 25%),
             linear-gradient(135deg, #ccc 25%, transparent 25%),
@@ -320,7 +320,7 @@ export const ImgThumb = ({
         `
       )}
     >
-      {!local.error && (
+      {!local.error && url && (
         <img
           onError={() => {
             local.error = true;
diff --git a/comps/form/field/type/KeyValue.tsx b/comps/form/field/type/KeyValue.tsx
index 6168c1b..bc63eb1 100755
--- a/comps/form/field/type/KeyValue.tsx
+++ b/comps/form/field/type/KeyValue.tsx
@@ -1,26 +1,204 @@
-export const KeyValue = () => {
+import { update } from "autosize";
+import { useLocal } from "lib/utils/use-local";
+import { useEffect, useRef } from "react";
+
+export const KeyValue = ({
+  value,
+  onChange,
+}: {
+  value: any;
+  onChange: (val: any) => void;
+}) => {
+  const local = useLocal({
+    entries: Object.entries(value),
+    new: { idx: -1, key: "", value: "" },
+  });
+  const ref = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    if (local.entries.length > 0) {
+      Object.entries(value).forEach(([k, v], idx) => {
+        const found = local.entries.find((e) => {
+          if (e[0] === k) return true;
+          return false;
+        });
+        if (found) {
+          found[0] = k;
+          found[1] = v;
+        } else {
+          local.entries.push([k, v]);
+        }
+      });
+    } else {
+      local.entries = Object.entries(value);
+    }
+    local.render();
+  }, [value]);
+
+  if (typeof value !== "object") return null;
+
+  const reverseEntries = (input: [string, unknown][]) => {
+    return input
+      .filter(([k, v]) => {
+        return true; // some irrelevant conditions here
+      })
+      .reduce((accum: any, [k, v]) => {
+        accum[k] = v;
+        return accum;
+      }, {});
+  };
   return (
-    <div className="c-flex c-relative c-flex-1">
-      <table className="c-flex-1">
+    <div className="c-flex c-relative c-flex-1" ref={ref}>
+      <table
+        className={cx(
+          "c-flex-1",
+          css`
+            input {
+              width: 100%;
+              height: 100%;
+              outline: none;
+              padding: 5px 10px;
+              border: 1px solid transparent;
+              &:focus {
+                border: 1px solid #1c4ed8;
+                outline: 1px solid #1c4ed8;
+              }
+            }
+          `
+        )}
+      >
         <tbody>
-          <tr>
-            <td>
-              <input type="text"></input>
-            </td>
-            <td>
-              <input type="text"></input>
-            </td>
-          </tr>
-          <tr>
-            <td>
-              <input type="text"></input>
-            </td>
-            <td>
-              <input type="text"></input>
-            </td>
-          </tr>
+          {local.entries.map((item, idx) => (
+            <KVRow
+              key={idx}
+              item={item}
+              idx={idx}
+              update={(idx, k, v) => {
+                local.entries[idx] = [k, v];
+
+                if (k === "" && v === "") {
+                  local.entries.splice(idx, 1);
+                }
+
+                local.render();
+              }}
+              onBlur={() => {
+                onChange(reverseEntries(local.entries));
+              }}
+            />
+          ))}
+          <KVRow
+            item={[local.new.key, local.new.value]}
+            idx={local.entries.length}
+            update={(idx, k, v) => {
+              local.new.key = k;
+              local.new.value = v;
+              local.render();
+            }}
+            onBlur={(field, val) => {
+              if (field === "key" && val) {
+                const idx = local.entries.length;
+                local.entries[idx] = [local.new.key, local.new.value];
+                local.new.key = "";
+                local.new.value = "";
+                local.render();
+                onChange(reverseEntries(local.entries));
+                setTimeout(() => {
+                  (
+                    ref?.current?.querySelector(
+                      `.kv-row-${idx} .kv-value input`
+                    ) as HTMLInputElement
+                  )?.focus();
+                }, 10);
+              }
+            }}
+          />
         </tbody>
       </table>
     </div>
   );
 };
+
+const KVRow = ({
+  item,
+  idx,
+  update,
+  onBlur,
+}: {
+  item: [string, unknown];
+  idx: number;
+  update: (idx: number, key: string, value: string) => void;
+  onBlur?: (field: "key" | "value", val: string) => void;
+}) => {
+  const [k, v] = item as any;
+  const keyref = useRef<HTMLInputElement>(null);
+  const valref = useRef<HTMLInputElement>(null);
+
+  return (
+    <tr className={`kv-row-${idx}`}>
+      <td
+        className={cx(
+          "kv-key",
+          css`
+            border-right: 1px solid #ececeb;
+            width: 30%;
+          `,
+          idx > 0 &&
+            css`
+              border-top: 1px solid #ececeb;
+            `
+        )}
+      >
+        <input
+          tabIndex={0}
+          type="text"
+          spellCheck={false}
+          value={k}
+          onChange={(e) => {
+            update(idx, e.currentTarget.value, v || "");
+          }}
+          onBlur={
+            onBlur
+              ? (e) => {
+                  onBlur("key", e.currentTarget.value);
+                }
+              : undefined
+          }
+          ref={keyref}
+        ></input>
+      </td>
+      <td
+        className={cx(
+          "kv-value",
+          idx > 0 &&
+            css`
+              border-top: 1px solid #ececeb;
+            `
+        )}
+      >
+        <input
+          tabIndex={0}
+          type="text"
+          spellCheck={false}
+          value={v || ""}
+          onChange={(e) => {
+            update(idx, k, e.currentTarget.value || "");
+          }}
+          onKeyDown={(e) => {
+            if (e.key === "Backspace" && !e.currentTarget.value) {
+              keyref.current?.focus();
+            }
+          }}
+          onBlur={
+            onBlur
+              ? (e) => {
+                  onBlur("value", e.currentTarget.value);
+                }
+              : undefined
+          }
+          ref={valref}
+        ></input>
+      </td>
+    </tr>
+  );
+};
diff --git a/comps/form/field/type/TypeInput.tsx b/comps/form/field/type/TypeInput.tsx
index 2eec322..ca77a21 100755
--- a/comps/form/field/type/TypeInput.tsx
+++ b/comps/form/field/type/TypeInput.tsx
@@ -215,7 +215,19 @@ export const FieldTypeInput: FC<{
       );
     }
     case "key-value":
-      return <KeyValue />;
+      return (
+        <KeyValue
+          value={
+            Object.keys(fm.data[field.name] || {}).length === 0
+              ? field.prop.kv?.default
+              : fm.data[field.name] || {}
+          }
+          onChange={(val) => {
+            fm.data[field.name] = val;
+            fm.render();
+          }}
+        />
+      );
     case "monthly": {
       return (
         <Datepicker
diff --git a/comps/form/typings.ts b/comps/form/typings.ts
index 498f5c8..909d36c 100755
--- a/comps/form/typings.ts
+++ b/comps/form/typings.ts
@@ -48,6 +48,7 @@ export type FieldProp = {
   label: string;
   desc?: string;
   props?: any;
+  kv?: { default: any };
   upload?: {
     mode: "single-file" | "multi-file";
     accept: string;