diff --git a/assets/public/widget.html b/assets/public/widget.html
index 7893d88..dade4cc 100644
--- a/assets/public/widget.html
+++ b/assets/public/widget.html
@@ -63,14 +63,6 @@
 
   <script>
     const guildId = new URLSearchParams(window.location.search).get("id");
-    const defaultAvatarHashMap = new Map([
-      ["0", "4a8562cf00887030c416d3ec2d46385a"],
-      ["1", "9b0bb198936784c45c72833cc426cc55"],
-      ["2", "22341bdb500c7b63a93bbce957d1601e"],
-      ["3", "d9977836b82058bf2f74eebd50edc095"],
-      ["4", "9d6ddb4e4d899a533a8cc617011351c9"],
-      ["5", "7213ab6677377974697dfdfbaf5f6a6f"],
-    ]);
 
     document.addEventListener("DOMContentLoaded", function() {
       const vcList = document.getElementById("vc-list");
@@ -78,11 +70,24 @@
       const onlineCount = document.getElementById("online-count");
 
       function fetchData() {
+        const refreshInterval = 1000;
         fetch(`/api/guilds/${guildId}/widget.json`)
-          .then(response => response.json())
+          .then(response => {
+            if (response.ok) {
+              const cacheDuration = response.headers.get("Cache-Control")?.match(/max-age=(\d+)/);
+              if (cacheDuration && cacheDuration[1]) {
+                const interval = parseInt(cacheDuration[1], 10) * 1000;
+                if (interval > refreshInterval) {
+                  setTimeout(fetchData, interval);
+                }
+              }
+            }
+            return response.json();
+          })
           .then(data => {
+            if (!data) return;
             // Update online count
-            onlineCount.textContent = data.presence_count;
+            onlineCount.textContent = data.presence_count + "/" + data.member_count;
 
             // Update voice channels
             vcList.innerHTML = "";
@@ -108,7 +113,7 @@
               const memberItem = document.createElement("div");
 
               const img = document.createElement("img");
-              img.src = member.avatar_url ;
+              img.src = member.avatar_url;
               img.alt = member.username;
               img.width = 32;
               img.height = 32;
@@ -127,16 +132,18 @@
               memberItem.style.marginBottom = "6px";
               memberList.appendChild(memberItem);
             });
+            setTimeout(fetchData, 300000); // schedule next fetch in 5 minutes
           })
           .catch(error => {
             console.error("Error fetching widget data:", error);
+            setTimeout(fetchData, Math.floor(Math.random() * 4000) + 1000);
           });
       }
 
       // Initial fetch
       fetchData();
 
-      // Refresh data every 30 seconds
+      // Refresh data every 5 minutes
       setInterval(fetchData, 30000);
     });
   </script>
diff --git "a/src/api/routes/guilds/\043guild_id/widget.json.ts" "b/src/api/routes/guilds/\043guild_id/widget.json.ts"
index 619bdb6..05c3087 100644
--- "a/src/api/routes/guilds/\043guild_id/widget.json.ts"
+++ "b/src/api/routes/guilds/\043guild_id/widget.json.ts"
@@ -100,17 +100,18 @@
         // Fetch members
         // TODO: Understand how Discord's max 100 random member sample works, and apply to here (see top of this file)
         const members = await Member.find({ where: { guild_id: guild_id }, relations: { user: { sessions: true } } });
-        const memberData = members.map((x) => {
+        const onlineMembers = members.filter((m) => m.user.sessions.filter((s) => (s.last_seen?.getTime() ?? 0) > Date.now() - 1000 * 60));
+        const memberData = onlineMembers.map((x) => {
             return {
                 id: x.id,
                 username: x.user.username,
                 discriminator: x.user.discriminator,
-                avatar: x.user.avatar,
+                avatar: null,
                 status: "online", // TODO
                 avatar_url: x.avatar
                     ? `${Config.get().cdn.endpointPublic}/guilds/${guild_id}/users/${x.id}/avatars/${x.avatar}.png`
                     : x.user.avatar
-                      ? `${Config.get().cdn.endpointPublic}/avatars/${x.id}/${x.avatar}.png`
+                      ? `${Config.get().cdn.endpointPublic}/avatars/${x.id}/${x.user.avatar}.png`
                       : `${Config.get().cdn.endpointPublic}/embed/avatars/${BigInt(x.id) % 6n}.png`,
             };
         });
@@ -122,7 +123,8 @@
             instant_invite: invite?.code,
             channels: channels,
             members: memberData,
-            presence_count: guild.presence_count || members.filter((m) => m.user.sessions.filter((s) => (s.last_seen?.getTime() ?? 0) > Date.now() - 1000 * 60)).length,
+            member_count: members.length,
+            presence_count: guild.presence_count || onlineMembers.length,
         };
 
         res.set("Cache-Control", "public, max-age=300");