diff --git a/src/components/avatarInfo/index.tsx b/src/components/avatarInfo/index.tsx
index 3d56d0f..3f2daa9 100644
--- a/src/components/avatarInfo/index.tsx
+++ b/src/components/avatarInfo/index.tsx
@@ -176,7 +176,6 @@ export default function AvatarInfo() {
                                                         onClick={() => {
                                                             const newSpValue = Math.ceil(avatars[avatarSelected?.id || ""]?.sp_max / 2);
                                                             const newAvatar = { ...avatars[avatarSelected?.id || ""], sp_value: newSpValue }
-                                                            console.log(newAvatar)
                                                             setAvatar(newAvatar)
                                                         }}
                                                     >
diff --git a/src/components/card/relicCard.tsx b/src/components/card/relicCard.tsx
index a95166e..bbccf39 100644
--- a/src/components/card/relicCard.tsx
+++ b/src/components/card/relicCard.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import useRelicMakerStore from "@/stores/relicMakerStore";
 import useUserDataStore from "@/stores/userDataStore";
 import Image from "next/image";
 import { useMemo } from "react";
@@ -21,72 +22,72 @@ const getRarityName = (slot: string) => {
     switch (slot) {
         case '1': return (
             <div className="flex items-center gap-1">
-                <Image 
-                src="/relics/HEAD.png" 
-                alt="Head" 
-                width={20} 
-                height={20} 
-                className="bg-black/50 rounded-full"
+                <Image
+                    src="/relics/HEAD.png"
+                    alt="Head"
+                    width={20}
+                    height={20}
+                    className="bg-black/50 rounded-full"
                 />
                 <h2>Head</h2>
             </div>
         );
         case '2': return (
             <div className="flex items-center gap-1">
-                <Image 
-                src="/relics/HAND.png" 
-                alt="Hand" 
-                width={20} 
-                height={20} 
-                className="bg-black/50 rounded-full"
+                <Image
+                    src="/relics/HAND.png"
+                    alt="Hand"
+                    width={20}
+                    height={20}
+                    className="bg-black/50 rounded-full"
                 />
                 <h2>Hands</h2>
             </div>
         );
         case '3': return (
             <div className="flex items-center gap-1">
-                <Image 
-                src="/relics/BODY.png" 
-                alt="Body" 
-                width={20} 
-                height={20} 
-                className="bg-black/50 rounded-full"
+                <Image
+                    src="/relics/BODY.png"
+                    alt="Body"
+                    width={20}
+                    height={20}
+                    className="bg-black/50 rounded-full"
                 />
                 <h2>Body</h2>
             </div>
         );
         case '4': return (
             <div className="flex items-center gap-1">
-                <Image 
-                src="/relics/FOOT.png" 
-                alt="Foot" 
-                width={20} 
-                height={20} 
-                className="bg-black/50 rounded-full"
+                <Image
+                    src="/relics/FOOT.png"
+                    alt="Foot"
+                    width={20}
+                    height={20}
+                    className="bg-black/50 rounded-full"
                 />
                 <h2>Feet</h2>
             </div>
         );
         case '5': return (
             <div className="flex items-center gap-1">
-                <Image 
-                src="/relics/NECK.png" 
-                alt="Neck" 
-                width={20} 
-                height={20} 
-                className="bg-black/50 rounded-full"
+                <Image
+                    src="/relics/NECK.png"
+                    alt="Neck"
+                    width={20}
+                    height={20}
+                    className="bg-black/50 rounded-full"
                 />
                 <h2>Planar sphere</h2>
             </div>
         );
         case '6': return (
             <div className="flex items-center gap-1">
-                <Image 
-                src="/relics/OBJECT.png" 
-                alt="Object" 
-                width={20} 
-                height={20} 
-                className="bg-black/50 rounded-full"
+                <Image
+                    src="/relics/OBJECT.png"
+                    alt="Object"
+                    width={20}
+                    height={20}
+                    className="bg-black/50 rounded-full"
                 />
                 <h2>Link rope</h2>
             </div>
@@ -96,6 +97,7 @@ const getRarityName = (slot: string) => {
 };
 export default function RelicCard({ slot, avatarId }: RelicCardProps) {
     const { avatars } = useUserDataStore()
+    const { selectedRelicSlot } = useRelicMakerStore()
 
     const relicDetail = useMemo(() => {
         const avatar = avatars[avatarId];
@@ -112,15 +114,15 @@ export default function RelicCard({ slot, avatarId }: RelicCardProps) {
         <div>
             {relicDetail ? (
                 <div
-                    className="flex flex-col items-center cursor-pointer">
+                    className="flex flex-col items-center cursor-pointer ">
                     <div
                         className={`
-                              relative w-24 h-24 rounded-full border-4 
+                              relative w-24 h-24 rounded-full
                               ${getRarityColor(relicDetail.relic_id.toString()[0])}
                               shadow-xl
                               flex items-center justify-center
-                              cursor-pointer hover:scale-105 transition-transform
-                              ring-4 ring-primary
+                              cursor-pointer transition-transform
+                              ${selectedRelicSlot === slot ? 'ring-5 ring-success scale-105' : 'ring-3 ring-primary'}
                             `}
                     >
                         <span>
diff --git a/src/components/monsterBar/ce.tsx b/src/components/monsterBar/ce.tsx
index b373c3f..79e84d1 100644
--- a/src/components/monsterBar/ce.tsx
+++ b/src/components/monsterBar/ce.tsx
@@ -27,6 +27,13 @@ export default function CeBar() {
     const { ce_config, setCeConfig } = useUserDataStore()
     const { listMonster } = useMonsterStore()
     const { locale } = useLocaleStore()
+    const transI18n = useTranslations("DataPage")
+    const [showSearchStage, setShowSearchStage] = useState(false)
+    const [stageSearchTerm, setStageSearchTerm] = useState("")
+    const [stagePage, setStagePage] = useState(1)
+
+    const pageSize = 30
+
     const filteredMonsters = useMemo(() => {
         const newlistMonster = new Set<MonsterBasic>()
         for (const monster of listMonster) {
@@ -39,11 +46,6 @@ export default function CeBar() {
         }
         return Array.from(newlistMonster)
     }, [listMonster, locale, searchTerm]);
-    const transI18n = useTranslations("DataPage")
-    const [showSearchStage, setShowSearchStage] = useState(false)
-    const [stageSearchTerm, setStageSearchTerm] = useState("")
-    const [stagePage, setStagePage] = useState(1)
-    const pageSize = 30
 
     const stageList = useMemo(() => Object.values(Stage).map((stage) => ({
         id: stage.stage_id.toString(),
diff --git a/src/components/relicsInfo/index.tsx b/src/components/relicsInfo/index.tsx
index 9aa10f4..6900fea 100644
--- a/src/components/relicsInfo/index.tsx
+++ b/src/components/relicsInfo/index.tsx
@@ -17,6 +17,7 @@ export default function RelicsInfo() {
   const { avatarSelected } = useAvatarStore()
   const {
     setSelectedRelicSlot,
+    selectedRelicSlot,
     setSelectedMainStat,
     setSelectedRelicSet,
     setSelectedRelicLevel,
@@ -157,7 +158,11 @@ export default function RelicsInfo() {
                   <div key={index} className="relative group">
                     <div
                       onClick={() => {
-                        handlerChangeRelic(item)
+                        if (item === selectedRelicSlot) {
+                          setSelectedRelicSlot("")
+                        } else {
+                          setSelectedRelicSlot(item)
+                        }
                       }}
                       className="cursor-pointer"
                     >
@@ -201,6 +206,29 @@ export default function RelicsInfo() {
                   </div>
                 ))}
               </div>
+              <div className="grid grid-cols-2 gap-2 mt-10">
+                <button
+                  disabled={!selectedRelicSlot}
+                  onClick={() => {
+                    handlerChangeRelic(selectedRelicSlot)
+                  }}
+                  className="btn btn-info"
+                >
+                    {transI18n("changeRelic")}
+                </button>
+                <button
+                  disabled={!selectedRelicSlot}
+                  onClick={(e) => {
+                    e.stopPropagation()
+                    if (window.confirm(`${transI18n("deleteRelicConfirm")} ${selectedRelicSlot}?`)) {
+                      handlerDeleteRelic(selectedRelicSlot)
+                    }
+                  }}
+                  className="btn btn-error"
+                >
+                    {transI18n("deleteRelic")}
+                </button>
+              </div>
             </div>
           </div>
 
diff --git a/src/components/skillsInfo/index.tsx b/src/components/skillsInfo/index.tsx
index 92a113b..92861a3 100644
--- a/src/components/skillsInfo/index.tsx
+++ b/src/components/skillsInfo/index.tsx
@@ -130,7 +130,6 @@ export default function SkillsInfo() {
         if (!status && traceLink?.[avatarSelected?.baseType || ""]?.[skillSelected || ""]) {
             traceLink[avatarSelected?.baseType || ""][skillSelected || ""].forEach((pointId) => {
                 if (avatarSkillTree?.[pointId]?.["1"]) {
-                    console.log(avatarSkillTree?.[pointId]?.["1"].PointID)
                     newData.data.skills[avatarSkillTree?.[pointId]?.["1"].PointID] = 0
                 }
             })