diff --git a/src/components/(layout)/SearchBar.jsx b/src/components/(layout)/SearchBar.jsx
index 6f65dd5..80aa900 100644
--- a/src/components/(layout)/SearchBar.jsx
+++ b/src/components/(layout)/SearchBar.jsx
@@ -1,18 +1,24 @@
-import { useState } from 'react';
-import { useRouter } from 'next/router';
+import { useState } from "react";
+import { useRouter } from "next/router";
 
 export default function SearchBar() {
-    const [query, setQuery] = useState('');
+    const [query, setQuery] = useState("");
     const router = useRouter();
 
-    const handleSearch = (e) => {
-        e.preventDefault();
-        if (query.trim()) { router.push(`/search?query=${query}`); }
+    const handleInputChange = (e) => {
+        const value = e.target.value;
+        setQuery(value);
+
+        if (value.trim()) {
+            router.push(`/search?query=${encodeURIComponent(value)}`, undefined, { shallow: true });
+        } else {
+            router.push(`/search`, undefined, { shallow: true });
+        }
     };
 
     return (
-        <form onSubmit={handleSearch} className="w-11/12 md:w-3/4 lg:w-1/2">
-            <input type="text" value={query} onChange={(e) => setQuery(e.target.value)} placeholder="Search users by name" className="py-3 px-5 bg-[#121212] rounded-full w-full" />
+        <form className="w-11/12 md:w-3/4 lg:w-1/2">
+            <input type="text" value={query} onChange={handleInputChange} placeholder="Search users by name" className="py-3 px-5 bg-[#121212] rounded-full w-full" />
         </form>
     );
 }
\ No newline at end of file
diff --git a/src/components/(user)/FriendButton.jsx b/src/components/(user)/FriendButton.jsx
new file mode 100644
index 0000000..5507611
--- /dev/null
+++ b/src/components/(user)/FriendButton.jsx
@@ -0,0 +1,64 @@
+import { useState, useEffect } from "react";
+import { doc, updateDoc, arrayUnion, arrayRemove, getDoc } from "firebase/firestore";
+import { db } from "@/lib/firebaseConfig";
+
+export default function FriendButton({ currentUserId, userId }) {
+    const [isFriend, setIsFriend] = useState(false);
+    const [loading, setLoading] = useState(false);
+
+    useEffect(() => {
+        const checkFriendshipStatus = async () => {
+            try {
+                const currentUserRef = doc(db, "users", currentUserId);
+                const currentUserDoc = await getDoc(currentUserRef);
+
+                if (currentUserDoc.exists()) {
+                    const currentUserData = currentUserDoc.data();
+                    setIsFriend(currentUserData.friends?.includes(userId) || false);
+                }
+            } catch (error) {
+                console.error("Error checking friendship status:", error);
+            }
+        };
+
+        checkFriendshipStatus();
+    }, [currentUserId, userId]);
+
+    const handleAddFriend = async () => {
+        setLoading(true);
+        try {
+            const currentUserRef = doc(db, "users", currentUserId);
+            await updateDoc(currentUserRef, {
+                friends: arrayUnion(userId),
+            });
+            setIsFriend(true);
+        } catch (error) {
+            console.error("Error adding friend:", error);
+        } finally {
+            setLoading(false);
+        }
+    };
+
+    const handleRemoveFriend = async () => {
+        setLoading(true);
+        try {
+            const currentUserRef = doc(db, "users", currentUserId);
+            await updateDoc(currentUserRef, {
+                friends: arrayRemove(userId),
+            });
+            setIsFriend(false);
+        } catch (error) {
+            console.error("Error removing friend:", error);
+        } finally {
+            setLoading(false);
+        }
+    };
+
+    if (currentUserId === userId) return null;
+
+    return (
+        <button onClick={isFriend ? handleRemoveFriend : handleAddFriend} disabled={loading} className={`px-4 py-2 bg-[#121212] border-[2px] border-[#333] rounded-md`}>
+            {loading ? "Processing..." : isFriend ? "Remove Friend" : "Add Friend"}
+        </button>
+    );
+}
\ No newline at end of file
diff --git a/src/components/(user)/UserData.jsx b/src/components/(user)/UserData.jsx
index 22df5c8..ba8fc30 100644
--- a/src/components/(user)/UserData.jsx
+++ b/src/components/(user)/UserData.jsx
@@ -1,8 +1,10 @@
 /* eslint-disable @next/next/no-img-element */
 import { signOut } from "next-auth/react";
+import FriendButton from "@/components/(user)/FriendButton";
 
 export default function UserData({ session, user, userId }) {
-    console.log(user)
+    const currentUserId = session?.user?.id;
+
     return (
         <div className="flex flex-col items-center w-full p-3 bg-[#121212] rounded-lg">
             <img src={user.image === 'unknown' ? 'https://github.com/user-attachments/assets/bf57cb96-b259-4290-b35b-0ede9d618802' : user.image} alt={user.name} className="w-32 h-32 lg:w-52 lg:h-52 rounded-full mb-4 object-cover" />
@@ -10,7 +12,13 @@ export default function UserData({ session, user, userId }) {
             <p className="text-sm lg:text-base text-[#888] mb-3">{user.points} TuneStats Points</p>
             <div className="w-full flex justify-center gap-2 text-sm">
                 <a href={`https://open.spotify.com/user/${userId}`} target="_blank" rel="noreferrer" className="px-4 py-2 bg-[#1DB954] rounded-md">Spotify</a>
-                {session?.user?.id === userId && (<button onClick={() => signOut()} className="px-4 py-2 bg-[#121212] border-[2px] border-[#333] rounded-md">Sign Out</button>)}
+                {session?.user?.id === userId ?
+                    (
+                        <button onClick={() => signOut()} className="px-4 py-2 bg-[#121212] border-[2px] border-[#333] rounded-md">Sign Out</button>
+                    ) : (
+                        <FriendButton currentUserId={currentUserId} userId={userId} />
+                    )
+                }
             </div>
         </div>
     )
diff --git a/src/pages/api/updatePoints/index.js b/src/pages/api/updatePoints/index.js
index 3c60909..16b4617 100644
--- a/src/pages/api/updatePoints/index.js
+++ b/src/pages/api/updatePoints/index.js
@@ -21,8 +21,6 @@ export default async function handler(req, res) {
 
             const usersSnapshot = await getDocs(usersQuery);
 
-            console.log(`Batch size fetched: ${usersSnapshot.size}`);
-
             if (usersSnapshot.empty) break;
 
             const users = usersSnapshot.docs.map(doc => ({
diff --git a/src/pages/search/index.jsx b/src/pages/search/index.jsx
index fc64859..f2396e1 100644
--- a/src/pages/search/index.jsx
+++ b/src/pages/search/index.jsx
@@ -1,9 +1,9 @@
-import { useState, useEffect } from 'react';
-import { useRouter } from 'next/router';
-import { db } from '@/lib/firebaseConfig';
-import { collection, getDocs } from 'firebase/firestore';
-import Navbar from '@/components/(layout)/NavBar';
-import UserSearchProfile from '@/components/(search)/UserSearchProfile';
+import { useState, useEffect } from "react";
+import { useRouter } from "next/router";
+import { db } from "@/lib/firebaseConfig";
+import { collection, getDocs } from "firebase/firestore";
+import Navbar from "@/components/(layout)/NavBar";
+import UserSearchProfile from "@/components/(search)/UserSearchProfile";
 
 export default function Search() {
     const router = useRouter();
@@ -17,14 +17,18 @@ export default function Search() {
         const fetchUsers = async () => {
             setLoading(true);
             try {
-                const querySnapshot = await getDocs(collection(db, 'users'));
-                const usersList = querySnapshot.docs.map(doc => doc.data());
+                const usersRef = collection(db, "users");
+                const querySnapshot = await getDocs(usersRef);
 
-                const filteredUsers = usersList.filter(user => user.name.toLowerCase().includes(searchQuery.toLowerCase()));
+                const filteredUsers = querySnapshot.docs
+                    .map((doc) => doc.data())
+                    .filter((user) =>
+                        user.name.toLowerCase().includes(searchQuery.toLowerCase())
+                    );
 
                 setUsers(filteredUsers);
             } catch (error) {
-                console.error('Error fetching users:', error);
+                console.error("Error fetching users:", error);
             } finally {
                 setLoading(false);
             }
@@ -33,15 +37,6 @@ export default function Search() {
         fetchUsers();
     }, [searchQuery]);
 
-    if (!searchQuery) {
-        return (
-            <div className="w-full h-screen">
-                <Navbar />
-                <h2 className="text-2xl text-center mt-10">Please enter a search query.</h2>
-            </div>
-        );
-    }
-
     return (
         <div className="w-full min-h-screen">
             <Navbar />
@@ -49,16 +44,12 @@ export default function Search() {
                 <h2 className="text-2xl font-bold mb-6">Search Results</h2>
                 {loading ? (
                     <p>Loading...</p>
+                ) : users.length > 0 ? (
+                    <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-3">
+                        {users.map((user) => (<UserSearchProfile key={user.spotifyId} user={user} />))}
+                    </div>
                 ) : (
-                    users.length > 0 ? (
-                        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-3">
-                            {users.map((user) => (
-                                <UserSearchProfile key={user.spotifyId} user={user} />
-                            ))}
-                        </div>
-                    ) : (
-                        <p>No users found</p>
-                    )
+                    <p>No users found</p>
                 )}
             </div>
         </div>