diff --git a/client/src/components/forms/PostFormCard.tsx b/client/src/components/forms/PostFormCard.tsx
index ed2029d..2594787 100644
--- a/client/src/components/forms/PostFormCard.tsx
+++ b/client/src/components/forms/PostFormCard.tsx
@@ -6,7 +6,6 @@ import { UnsignedEvent, Event as NostrEvent, nip19 } from "nostr-tools";
 import { useSubmitForm } from "./handleSubmit";
 import "../../styles/Form.css";
 import EmotePicker from "../modals/EmotePicker/EmotePicker";
-import emotes from "../modals/EmotePicker/custom_emojis.json"
 import { DEFAULT_DIFFICULTY } from "../../config";
 
 interface FormProps {
@@ -43,11 +42,11 @@ const NewNoteCard = ({
         }
 
         if (refEvent && tagType) {
-            unsigned.tags = Array.from(new Set(unsigned.tags.concat(refEvent.tags)));
+            unsigned.tags = Array.from(new Set(unsigned.tags.concat(refEvent.tags.filter(tag => tag[0] === 'e' || tag[0] === 'p'))));
             unsigned.tags.push(['p', refEvent.pubkey]);
 
             if (tagType === 'Reply') {
-                unsigned.tags.push(['e', refEvent.id, refEvent.tags.some(tag => tag[0] === 'e') ? 'root' : '']);
+                unsigned.tags.push(['e', refEvent.id]);
             } else {
                 if (tagType === 'Quote') {
                     setComment(comment + '\nnostr:' + nip19.noteEncode(refEvent.id));
@@ -168,10 +167,9 @@ const NewNoteCard = ({
                 </div>
                 {doingWorkProp ? (
                     <div className="flex animate-pulse text-xs text-gray-300">
-                        <CpuChipIcon className="h-4 w-4 ml-auto" />
-                        <span>Doing Work:</span>
+                        <span className="ml-auto">Doing Work:</span>
                         {hashrate && <span>{hashrate > 100000 ? `${(hashrate / 1000).toFixed(0)}k` : hashrate}</span>}H/s
-                        <span className="pl-1"> (PB:{bestPow})</span>
+                        <span className="pl-1"> (PB:{bestPow}</span><CpuChipIcon className="h-4 w-4" />)
                     </div>
                 ) : null}
             </div>
diff --git a/client/src/components/routes/Home.tsx b/client/src/components/routes/Home.tsx
index cc2b57f..862963e 100644
--- a/client/src/components/routes/Home.tsx
+++ b/client/src/components/routes/Home.tsx
@@ -4,10 +4,22 @@ import NewNoteCard from "../forms/PostFormCard";
 import { DEFAULT_DIFFICULTY } from "../../config";
 import PostCard from "../modals/PostCard";
 import { useFetchEvents } from "../../hooks/useFetchEvents";
+import { useState, useEffect } from "react";
 
 const Home = () => {
   const filterDifficulty = localStorage.getItem("filterDifficulty") || DEFAULT_DIFFICULTY;
   const { noteEvents, metadataEvents } = useFetchEvents();
+  const [isAnimating, setIsAnimating] = useState(true);
+
+  // Step 3: Use useEffect to remove the animation class after 3 seconds
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      setIsAnimating(false);
+    }, 3000); // 3000 milliseconds = 3 seconds
+
+    return () => clearTimeout(timer); // Cleanup the timer
+  }, []); // Empty dependency array means this effect runs once on mount
+
 
   const postEvents: Event[] = noteEvents
     .filter((event) =>
@@ -43,7 +55,7 @@ const Home = () => {
       <div className="w-full px-4 sm:px-0 sm:max-w-xl mx-auto my-2">
         <NewNoteCard />
       </div>
-      <div className="grid grid-cols-1 max-w-xl mx-auto gap-1 px-4">
+      <div className={`grid grid-cols-1 max-w-xl mx-auto gap-1 px-4 ${isAnimating ? 'animate-pulse' : ''}`}>
         {sortedEvents.map((event) => (
             <PostCard
               key={event.postEvent.id}