diff --git a/docs/astro.config.mjs b/docs/astro.config.mjs
index 98f28c0..bce29de 100644
--- a/docs/astro.config.mjs
+++ b/docs/astro.config.mjs
@@ -54,19 +54,19 @@ export default defineConfig({
         ru: 'Руководство'
       }
     },
-    //   {
-    //   label: 'Leaderboard',
-    //   autogenerate: {
-    //     directory: 'leaderboard',
-    //     collapsed: true
-    //   },
-    //   translations: {
-    //     es: 'Leaderboard',
-    //     fr: 'Leaderboard',
-    //     pt: 'Leaderboard',
-    //     ru: 'Leaderboard'
-    //   }
-    // },
+      {
+      label: 'Leaderboard',
+      autogenerate: {
+        directory: 'leaderboard',
+        collapsed: true
+      },
+      translations: {
+        es: 'Leaderboard',
+        fr: 'Leaderboard',
+        pt: 'Leaderboard',
+        ru: 'Leaderboard'
+      }
+    },
     {
       label: 'Challenges',
       autogenerate: {
diff --git a/docs/src/components/leaderboard/LeaderboardAnswer.svelte b/docs/src/components/leaderboard/LeaderboardAnswer.svelte
index 4ca9951..e7c13fe 100644
--- a/docs/src/components/leaderboard/LeaderboardAnswer.svelte
+++ b/docs/src/components/leaderboard/LeaderboardAnswer.svelte
@@ -1,18 +1,29 @@
 <script>
-  import { onMount } from 'svelte';
   import UserBox from './UserBox.svelte';
+  import Spinner from './Spinner.svelte';
+  import { token } from '../github/github-store';
 
   let users = [];
   let loading = true;
   let error = null;
 
+  token.subscribe(token => {
+    if (token) {
+      fetchGitHubUsers();
+    }
+  })
+
   async function fetchGitHubUsers() {
     try {
       const prCounts = {};
       let page = 1;
 
       while (true) {
-        const response = await fetch(`https://api.github.com/search/issues?q=repo:tomalaforge/angular-challenges+is:pr+label:%22answer%22&per_page=200&page=${page}`);
+        const response = await fetch(`https://api.github.com/search/issues?q=repo:tomalaforge/angular-challenges+is:pr+label:%22answer%22&per_page=200&page=${page}`, {
+          headers: {
+            Authorization: `token ${$token}`
+          }
+        });
         if (!response.ok) {
           throw new Error('API rate limit exceeded. Please try again in a few minutes.');
         }
@@ -58,13 +69,10 @@
 
   }
 
-  onMount(() => {
-    fetchGitHubUsers();
-  });
 </script>
 
 {#if loading}
-  <p>Loading...</p>
+  <Spinner />
 {:else if error}
   <p>Error: {error}</p>
 {:else}
@@ -84,6 +92,7 @@
     justify-items: center;
     grid-template-columns: 1fr 1fr;
     gap: 1.5rem;
+    margin-top: 2rem;
   }
 
   .challenge-number {
diff --git a/docs/src/components/leaderboard/LeaderboardChallenge.svelte b/docs/src/components/leaderboard/LeaderboardChallenge.svelte
index ea44598..302bb65 100644
--- a/docs/src/components/leaderboard/LeaderboardChallenge.svelte
+++ b/docs/src/components/leaderboard/LeaderboardChallenge.svelte
@@ -1,12 +1,19 @@
 <script>
-  import { onMount } from 'svelte';
   import UserBox from './UserBox.svelte';
+  import Spinner from './Spinner.svelte';
+  import { token } from '../github/github-store';
 
 
   let users = [];
   let loading = true;
   let error = null;
 
+  token.subscribe(token => {
+    if (token) {
+      fetchGitHubUsers();
+    }
+  })
+
   const createUser = (items) => {
     const prCounts = {};
     items.forEach((pr) => {
@@ -30,7 +37,11 @@
 
   async function fetchGitHubUsers() {
     try {
-      const response = await fetch(`https://api.github.com/search/issues?q=repo:tomalaforge/angular-challenges+is:pr+label:%22challenge-creation%22`);
+      const response = await fetch(`https://api.github.com/search/issues?q=repo:tomalaforge/angular-challenges+is:pr+label:%22challenge-creation%22`, {
+        headers: {
+          Authorization: `token ${$token}`
+        }
+      });
       if (!response.ok) {
         throw new Error('API rate limit exceeded. Please try again in a few minutes.');
       }
@@ -42,19 +53,15 @@
       loading = false;
     }
   }
-
-  onMount(() => {
-    fetchGitHubUsers();
-  });
 </script>
 
 {#if loading}
-  <p>Loading...</p>
+  <Spinner />
 {:else if error}
   <p>Error: {error}</p>
 {:else}
   <div class="box not-content">
-    {#each users as { avatar, count, login, challengeNumber }, index}
+    {#each users as { avatar, count, login }, index}
       <UserBox {avatar} {login} {index}>
         {count} Challenges Created
       </UserBox>
@@ -68,5 +75,6 @@
     justify-items: center;
     grid-template-columns: 1fr 1fr;
     gap: 1.5rem;
+    margin-top: 2rem;
   }
 </style>
diff --git a/docs/src/components/leaderboard/LeaderboardCommit.svelte b/docs/src/components/leaderboard/LeaderboardCommit.svelte
index 8da56b8..e5dc8db 100644
--- a/docs/src/components/leaderboard/LeaderboardCommit.svelte
+++ b/docs/src/components/leaderboard/LeaderboardCommit.svelte
@@ -1,18 +1,29 @@
 <script>
-  import { onMount } from 'svelte';
   import UserBox from './UserBox.svelte';
+  import Spinner from './Spinner.svelte';
+  import { token } from '../github/github-store';
 
   let users = [];
   let loading = true;
   let error = null;
 
+  token.subscribe(token => {
+    if (token) {
+      fetchGitHubUsers();
+    }
+  })
+
   async function fetchGitHubUsers() {
     try {
       const prCounts = {};
       let page = 1;
 
       while (true) {
-        const response = await fetch(`https://api.github.com/search/issues?q=repo:tomalaforge/angular-challenges+is:pr+no:label&per_page=100&page=${page}`);
+        const response = await fetch(`https://api.github.com/search/issues?q=repo:tomalaforge/angular-challenges+is:pr+no:label&per_page=100&page=${page}`,{
+          headers: {
+            Authorization: `token ${$token}`
+          }
+        });
         if (!response.ok) {
           throw new Error('API rate limit exceeded. Please try again in a few minutes.');
         }
@@ -49,7 +60,7 @@
         avatar: pr.avatar,
         count: pr.count,
         challengeNumber: pr.challengeNumber
-      })).filter((r) => r.login !== 'allcontributors[bot]').sort((a, b) => b.count - a.count);
+      })).filter((r) => r.login !== 'allcontributors[bot]' && r.login !== 'tomalaforge').sort((a, b) => b.count - a.count);
 
     } catch (e) {
       error = e.message;
@@ -58,14 +69,10 @@
     }
 
   }
-
-  onMount(() => {
-    fetchGitHubUsers();
-  });
 </script>
 
 {#if loading}
-  <p>Loading...</p>
+  <Spinner />
 {:else if error}
   <p>Error: {error}</p>
 {:else}
@@ -84,5 +91,6 @@
     justify-items: center;
     grid-template-columns: 1fr 1fr;
     gap: 1.5rem;
+    margin-top: 2rem;
   }
 </style>
diff --git a/docs/src/components/leaderboard/Spinner.svelte b/docs/src/components/leaderboard/Spinner.svelte
new file mode 100644
index 0000000..07dd361
--- /dev/null
+++ b/docs/src/components/leaderboard/Spinner.svelte
@@ -0,0 +1,33 @@
+
+<div class="spinner-container">
+<div class="spinner"></div>
+</div>
+
+<style>
+  .spinner-container {
+    margin-top: 2rem;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .spinner {
+    border: 4px solid var(--sl-color-gray-3); /* Light grey border */
+    border-top: 4px solid var(--sl-color-bg);
+    border-right: 4px solid var(--sl-color-bg);
+    border-radius: 50%;
+    width: 50px;
+    height: 50px;
+    animation: spin 2s linear infinite;
+  }
+
+  @keyframes spin {
+    0% {
+      transform: rotate(0deg);
+    }
+    100% {
+      transform: rotate(360deg);
+    }
+  }
+</style>
diff --git a/docs/src/content/docs/index.mdx b/docs/src/content/docs/index.mdx
index 4e53c06..86ebd36 100644
--- a/docs/src/content/docs/index.mdx
+++ b/docs/src/content/docs/index.mdx
@@ -26,6 +26,7 @@ import MyIcon from '../../components/MyIcon.astro';
 
 import SubscriptionForm from '../../components/SubscriptionForm.astro';
 
+
 <CardGrid>
 <Card title="47 Challenges">
     This repository gathers 47 Challenges related to <b>Angular</b>, <b>Nx</b>, <b>RxJS</b>, <b>Ngrx</b> and <b>Typescript</b>.
diff --git a/docs/src/content/docs/leaderboard/answers.mdx b/docs/src/content/docs/leaderboard/answers.mdx
index f8ba030..03a1f2a 100644
--- a/docs/src/content/docs/leaderboard/answers.mdx
+++ b/docs/src/content/docs/leaderboard/answers.mdx
@@ -8,4 +8,6 @@ next: false
 
 import LeaderboardAnswer from '../../../components/leaderboard/LeaderboardAnswer.svelte';
 
+Join the list and start your Angular Challenges journey by reading the [Getting Started](/guides/getting-started) guide.
+
 <LeaderboardAnswer client:load />
diff --git a/docs/src/content/docs/leaderboard/challenges.mdx b/docs/src/content/docs/leaderboard/challenges.mdx
index 049fdfa..f5db034 100644
--- a/docs/src/content/docs/leaderboard/challenges.mdx
+++ b/docs/src/content/docs/leaderboard/challenges.mdx
@@ -8,4 +8,7 @@ next: false
 
 import LeaderboardChallenge from '../../../components/leaderboard/LeaderboardChallenge.svelte';
 
+A challenge is missing, create your own one and get on the leaderboard!
+Read the [Create Challenge](/guides/create-challenge) guide to learn how to create a challenge.
+
 <LeaderboardChallenge client:load />
diff --git a/docs/src/content/docs/leaderboard/commit.mdx b/docs/src/content/docs/leaderboard/commit.mdx
index 76ec860..1dcbbca 100644
--- a/docs/src/content/docs/leaderboard/commit.mdx
+++ b/docs/src/content/docs/leaderboard/commit.mdx
@@ -8,4 +8,7 @@ next: false
 
 import LeaderboardCommit from '../../../components/leaderboard/LeaderboardCommit.svelte';
 
+You want to improve the project, fix a typo, add some documentation to one challenges, or translate a page? This leaderboard shows the number of contributions per user.
+This repository is open source and you can contribute to it. Read the [contribution](/guides/contribute) guide to get started.
+
 <LeaderboardCommit client:load />