diff --git a/app/page.tsx b/app/page.tsx
index da2f0ca..0cd3a95 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -1,4 +1,4 @@
-import { Typography } from "@/components/elements"
+import { Typography } from "@/components/elements/Typography"
 
 const Home: React.FC = () => {
   return (
diff --git a/components/elements/Image.config.tsx b/components/elements/Image.config.tsx
index f362ccf..e5796ad 100644
--- a/components/elements/Image.config.tsx
+++ b/components/elements/Image.config.tsx
@@ -5,7 +5,7 @@ export const ImageConfig: ElementConfig = {
     label: "Image",
     fields: {
       src: {
-        type: "text",
+        type: "image",
         label: "Source URL",
       },
       alt: {
@@ -28,11 +28,11 @@ export const ImageConfig: ElementConfig = {
         label: "Circle",
       },
       width: {
-        type: "text",
+        type: "number",
         label: "Width",
       },
       height: {
-        type: "text",
+        type: "number",
         label: "Height",
       },
     },
diff --git a/components/elements/Image.tsx b/components/elements/Image.tsx
index 1a24cc6..e4307a8 100644
--- a/components/elements/Image.tsx
+++ b/components/elements/Image.tsx
@@ -1,5 +1,4 @@
 import * as React from "react"
-import NextImage from "next/image"
 
 import { cn } from "@/lib/utils"
 
@@ -38,7 +37,7 @@ function Image({
   className,
 }: ImageProps) {
   return (
-    <NextImage
+    <img
       data-slot="image"
       src={src}
       alt={alt}
diff --git a/components/elements/index.ts b/components/elements/index.ts
deleted file mode 100644
index 8cb1550..0000000
--- a/components/elements/index.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-export * from "./types"
-
-export { Typography } from "./Typography"
-export type {
-  TypographyProps,
-  TypographyVariant,
-  TypographyAlign,
-  TypographyWeight,
-} from "./Typography"
-export { TypographyConfig } from "./Typography.config"
-
-export { Button } from "./Button"
-export type { ButtonProps, ButtonVariant, ButtonSize } from "./Button"
-export { ButtonConfig } from "./Button.config"
-
-export { Image } from "./Image"
-export type { ImageProps, ObjectFit } from "./Image"
-export { ImageConfig } from "./Image.config"
-
-export { Icon } from "./Icon"
-export type { IconProps, IconName } from "./Icon"
-export { IconConfig } from "./Icon.config"
-
-export { Card } from "./Card"
-export type { CardProps, CardTag } from "./Card"
-export { CardConfig } from "./Card.config"
diff --git a/components/elements/types.ts b/components/elements/types.ts
index a4648b3..cccf816 100644
--- a/components/elements/types.ts
+++ b/components/elements/types.ts
@@ -7,6 +7,8 @@ export type FieldType =
   | "object"
   | "boolean"
   | "select"
+  | "image"
+  | "number"
 
 export interface FieldOption {
   label: string