diff --git a/src/components/Leaderboard.astro b/src/components/Leaderboard.astro
index e4713569..f0beb4ec 100644
--- a/src/components/Leaderboard.astro
+++ b/src/components/Leaderboard.astro
@@ -14,11 +14,11 @@ import {
   sortMembersByDevs, DEV_GROUP_BOUNDS
 } from '../members.ts';
 
-const members = await getMembers();
+const members = filterInactiveMembers(await getMembers());
 ---
 
 {grouped ? <div>
-  {groupMembers(filterInactiveMembers(members)).map((groupMembers, idx) => groupMembers.length > 0 && <div>
+  {groupMembers(members).map((groupMembers, idx) => groupMembers.length > 0 && <div>
     <h2>{formatDevGroupBounds(DEV_GROUP_BOUNDS[idx])}</h2>
     <table class="table--lrr table--40-30-30">
       <thead>
@@ -57,7 +57,7 @@ const members = await getMembers();
       </tr>
     </thead>
     <tbody>
-      {sortMembersByDevs(filterInactiveMembers(members)).map((member) => <tr>
+      {sortMembersByDevs(members).map((member) => <tr>
         <LeaderboardMember member={member}></LeaderboardMember>
       </tr>)}
     </tbody>
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 12e1209c..00da1455 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -9,6 +9,11 @@ import Button from "../components/Button.astro";
 import Layout from "../layouts/Layout.astro";
 import MiniLeaderboard from "../components/MiniLeaderboard.astro";
 import TextButton from "../components/TextButton.astro";
+import {
+  getMembers, filterInactiveMembers,
+} from '../members.ts';
+
+const members = filterInactiveMembers(await getMembers());
 ---
 
 <Layout>
@@ -36,11 +41,10 @@ import TextButton from "../components/TextButton.astro";
             </div>
           </div>
           <p
-            >Whether you're a CEO, CFO, CTO, or just a dev, your company surely depends on Open Source software. It's time to pay the maintainers.</p
-          >
-          <Button href="/join"
-            >Join the Pledge</Button
+            >Whether you're a CEO, CFO, CTO, or just a dev, your company surely depends on Open Source software. It's
+            time to pay the maintainers.</p
           >
+          <Button href="/join">Join the Pledge</Button>
         </div>
       </section>
 
@@ -54,9 +58,7 @@ import TextButton from "../components/TextButton.astro";
 
         <div class="highlight-box highlight-box--circled">
           <h3><div><span class="circled">2</span></div><span>Self-report annually</span></h3>
-          <p
-            >Each year, publish a blog post outlining your payments to maintainers.</p
-          >
+          <p>Each year, publish a blog post outlining your payments to maintainers.</p>
         </div>
       </section>
 
@@ -69,9 +71,7 @@ import TextButton from "../components/TextButton.astro";
           <MiniLeaderboard></MiniLeaderboard>
 
           <div class="text-center">
-            <TextButton href="/members"
-              >Explore all members</TextButton
-            >
+            <TextButton href="/members">Explore all {members.length} members</TextButton>
           </div>
         </div>
       </section>
@@ -83,9 +83,7 @@ import TextButton from "../components/TextButton.astro";
           </div>
 
           <div class="text-center">
-            <Button href="/join"
-              >Join the Pledge</TextButton
-            >
+            <Button href="/join">Join the Pledge</TextButton>
           </div>
         </div>
       </section>