diff --git a/app/blog/first-post/page.tsx b/app/blog/first-post/page.tsx
index 48828f16b..e6d903b38 100644
--- a/app/blog/first-post/page.tsx
+++ b/app/blog/first-post/page.tsx
@@ -53,7 +53,7 @@ export default function FirstPostPage() {
           </p>
           {post && (
             <div>
-              <img
+              <Image
                 src={post?.imageUrl}
                 alt={post?.title}
                 className="float-left mr-4 mb-2 w-1/3 h-auto object-cover rounded-lg"
diff --git a/app/blog/second-post/page.tsx b/app/blog/second-post/page.tsx
index e4f1bfc53..c8c28219c 100644
--- a/app/blog/second-post/page.tsx
+++ b/app/blog/second-post/page.tsx
@@ -53,7 +53,7 @@ export default function SecondPostPage() {
           </p>
           {post && (
             <div>
-              <img
+              <Image
                 src={post?.imageUrl}
                 alt={post?.title}
                 className="float-left mr-4 mb-2 w-1/3 h-auto object-cover rounded-lg"
diff --git a/app/blog/third-post/page.tsx b/app/blog/third-post/page.tsx
index 01335892e..6f3b6a6d9 100644
--- a/app/blog/third-post/page.tsx
+++ b/app/blog/third-post/page.tsx
@@ -53,7 +53,7 @@ export default function ThirdPostPage() {
           </p>
           {post && (
             <div>
-              <img
+              <Image
                 src={post?.imageUrl}
                 alt={post?.title}
                 className="float-left mr-4 mb-2 w-1/3 h-auto object-cover rounded-lg"
diff --git a/components/DataSet.tsx b/components/DataSet.tsx
index 74062b476..05786c552 100644
--- a/components/DataSet.tsx
+++ b/components/DataSet.tsx
@@ -1,6 +1,7 @@
 // app/components/DataSet.tsx
 import React from 'react';
 import data from '../app/blog/data/dataset.json';
+import Image from 'next/image';
 
 interface DataItem {
     id: string;
@@ -21,7 +22,7 @@ const DataSet: React.FC = () => {
                 <div key={item.id} className="relative flex rounded-sm gap-2 bg-seven overflow-hidden w-1/4 ">
                     <div className='overflow-hidden p-1 rounded-sm'>
                         
-                        <img
+                        <Image
                             src={item.media_url}
                             alt={item.timestamp}
                             className="w-full h-auto hover:opacity-75 transition-all duration-800 rounded object-cover"
diff --git a/components/Gallery.tsx b/components/Gallery.tsx
index 9f68c7d6f..e5a691d93 100644
--- a/components/Gallery.tsx
+++ b/components/Gallery.tsx
@@ -1,4 +1,5 @@
 'use client'
+import Image from 'next/image';
 import React from 'react';
 
 interface Image {
@@ -21,7 +22,7 @@ const Gallery: React.FC<GalleryProps> = ({ feed }) => {
       {images &&
         images.map((image) => (
           <div key={image.id} className="relative overflow-hidden">
-            <img
+            <Image
               src={image.media_url}
               alt={image.caption}
               className="w-full h-auto object-cover"
diff --git a/components/InstaGallery.tsx b/components/InstaGallery.tsx
index a5543cd25..3cb1cb912 100644
--- a/components/InstaGallery.tsx
+++ b/components/InstaGallery.tsx
@@ -1,4 +1,5 @@
 "use client"
+import Image from 'next/image';
 import React, { useEffect, useState } from 'react';
 
 interface Image {
@@ -37,7 +38,7 @@ const InstaGallery: React.FC = () => {
         {images.map((image) => (
           <div key={image.id} className="relative overflow-hidden w-1/4 ">
             <div className='overflow-hidden rounded-sm'>
-            <img
+            <Image
               src={image.media_url}
               alt={image.caption}
               className="w-full h-auto object-cover"
diff --git a/components/ui/accordion.tsx b/components/accordion.tsx
similarity index 100%
rename from components/ui/accordion.tsx
rename to components/accordion.tsx
diff --git a/components/ui/Accordion.tsx b/components/ui/Accordion.tsx
index 128bbcd90..17d6bd1cc 100644
--- a/components/ui/Accordion.tsx
+++ b/components/ui/Accordion.tsx
@@ -1,11 +1,8 @@
 import { AnimatedTooltipPreview } from "@/components/AnimatedToolstips";
 import { AnimatedTooltip } from "@/components/ui/animated-tooltip";
-import {
-  Accordion,
-  AccordionContent,
-  AccordionItem,
-  AccordionTrigger,
-} from "@/components/ui/accordion";
+import { Accordion, AccordionItem, AccordionTrigger, AccordionContent} from "../accordion";
+
+
 
 export function AccordionDemo() {
   return (