diff --git a/lib/puzzles.ts b/lib/puzzles.ts
index 5c1a4b5..158a41d 100644
--- a/lib/puzzles.ts
+++ b/lib/puzzles.ts
@@ -85,6 +85,7 @@ export type Puzzle = {
   content: string;
   scoreMax: number;
   tags: Tag[] | null;
+  tries?: number;
   score?: number;
 };
 
diff --git a/ui/Leaderboard.tsx b/ui/Leaderboard.tsx
index a79c6b2..eafe411 100644
--- a/ui/Leaderboard.tsx
+++ b/ui/Leaderboard.tsx
@@ -5,46 +5,67 @@ import { cn } from '@/lib/utils';
 import { useMemo, useState } from 'react';
 import AvatarComponent from './Avatar';
 import Select from './Select';
+import { type ScoreEvent } from '@/lib/leaderboard';
+import useSWRSubscription, { type SWRSubscription } from 'swr/subscription';
+import { useGroups } from '@/lib/hooks/use-groups';
 
 const SCORE_COLORS = ['text-yellow-400', 'text-gray-400', 'text-orange-400'];
 
 export default function Leaderboard({ token }: { token: string }) {
-  const { data, isLoading } = useLeaderboard({ token });
+  // const { data, isLoading } = useLeaderboard({ token });
+
+  const subscription: SWRSubscription<string, ScoreEvent, Error> = (key, { next }) => {
+    const socket = new WebSocket(key);
+
+    socket.addEventListener('message', (event) => {
+      next(null, JSON.parse(event.data));
+    });
+
+    socket.addEventListener('error', (event) => {
+      console.error(event);
+    });
+
+    return () => socket.close();
+  };
+
+  const { data } = useSWRSubscription(
+    `wss://${process.env.NEXT_PUBLIC_API_URL?.split('//')[1]}/rleaderboard`,
+    subscription
+  );
 
   const [filter, setFilter] = useState('');
 
   let options = [] as { value: string; title: string }[];
 
-  if (data) {
-    options = data
-      .filter((score) => score.groups && score.groups.length > 0)
-      .map((score) => score.groups.map((group) => ({ value: group.name, title: group.name })))
-      .flat()
+  const { data: groups } = useGroups({ token });
+
+  if (groups) {
+    options = groups
+      .filter((group) => !group.chapter)
+      .map((group) => ({ value: group.name, title: group.name }))
       .filter((group, index, self) => self.findIndex((g) => g.value === group.value) === index)
       .sort((a, b) => a.title.localeCompare(b.title));
 
     options.unshift({ value: '', title: 'Tous' });
-    options.push({ value: 'no-group', title: 'Sans groupe' });
   }
 
   const filteredData = useMemo(() => {
     if (filter) {
-      if (filter === 'no-group') {
-        return data?.filter((score) => !score.groups || score.groups.length === 0);
-      }
-      return data?.filter((score) => score.groups?.find((group) => group.name === filter));
+      return data?.groups.filter((group) => group.name === filter);
     }
     return data;
   }, [data, filter]);
 
+  console.log(filteredData);
+
   return (
     <section className="flex h-full w-full flex-col space-y-4">
       <header className="sticky flex items-center justify-between">
         <div className="flex flex-col">
           <h1 className="text-xl font-semibold">Tableau des scores</h1>
-          <p className="hidden text-muted sm:block">Suivez la progression des élèves en direct</p>
+          <p className="text-muted">Suivez la progression des élèves en direct</p>
         </div>
-        {(filteredData && (
+        {/* {(filteredData && (
           <Select
             className="w-32"
             options={options || []}
@@ -58,12 +79,13 @@ export default function Leaderboard({ token }: { token: string }) {
               animationDuration: '1s'
             }}
           />
-        )}
+        )} */}
       </header>
       <main className="flex flex-col justify-between space-x-0 space-y-4 pb-4">
-        <ul className="flex flex-col space-y-2">
+        Waiting for the leaderboard to be implemented (Xavier WSS)
+        {/* <ul className="flex flex-col space-y-2">
           {(!isLoading &&
-            filteredData?.map((score, key) => (
+            filteredData((group, key) => (
               <li key={key} className="flex justify-between space-x-2">
                 <div className="flex items-center space-x-4">
                   <span className={cn('font-semibold', SCORE_COLORS[score.rank - 1])}>
@@ -104,7 +126,7 @@ export default function Leaderboard({ token }: { token: string }) {
                 }}
               />
             ))}
-        </ul>
+        </ul> */}
       </main>
     </section>
   );
diff --git a/ui/Puzzle.tsx b/ui/Puzzle.tsx
index ec9afb4..a34cf4a 100644
--- a/ui/Puzzle.tsx
+++ b/ui/Puzzle.tsx
@@ -59,8 +59,9 @@ export default function Puzzle({ token, id }: { token: string; id: number }) {
     });
 
     if (res.ok || res.status === 406) {
-      mutate(`puzzles/${puzzle?.id}`);
-      setGranted(await res.json());
+      const data = (await res.json()) as { tries: number; score?: number };
+      if (data.score) mutate(`puzzles/${puzzle?.id}`);
+      else setGranted(data);
     }
   }
 
@@ -89,7 +90,7 @@ export default function Puzzle({ token, id }: { token: string; id: number }) {
               className="w-full"
               label="Réponse"
               type="text"
-              placeholder="12"
+              placeholder="CAPTAIN LOOK !"
               required
               {...register('answer')}
             />
@@ -114,11 +115,19 @@ export default function Puzzle({ token, id }: { token: string; id: number }) {
         </form>
       ) : (
         <div className="flex items-center justify-between">
-          <p className="text-sm text-highlight-secondary">
-            Score : {puzzle.score} (Score maximum: {puzzle.scoreMax})
-          </p>
-          <AppLink href="/dashboard/puzzles" className="text-sm text-highlight-secondary">
-            Retour aux puzzles
+          <div className=" items-center gap-x-2">
+            <p className="text-sm">
+              Tentatives : <span className="text-brand">{puzzle.tries}</span>
+            </p>
+            <p className="text-sm">
+              Score : <span className="text-brand">{puzzle.score}</span> (Score maximum:{' '}
+              {puzzle.scoreMax})
+            </p>
+          </div>
+          <AppLink href="/dashboard/puzzles">
+            <Button kind="brand" type="button">
+              Retour aux puzzles
+            </Button>
           </AppLink>
         </div>
       )}
diff --git a/ui/Puzzles.tsx b/ui/Puzzles.tsx
index c379357..d19cfb8 100644
--- a/ui/Puzzles.tsx
+++ b/ui/Puzzles.tsx
@@ -44,7 +44,7 @@ export default function Puzzles({ token }: { token: string }) {
           <div key={chapter.id} className="flex flex-col space-y-4">
             <div className="flex flex-col justify-between lg:flex-row lg:items-center">
               <div className="flex items-center gap-x-2">
-                <h1 className="text-xl font-semibold sm:text-2xl">{chapter.name}</h1>
+                <h1 className="text-xl font-semibold">{chapter.name}</h1>
                 {!isInEventGroup(chapter) && (
                   <Dialog
                     key={chapter.id}
@@ -167,11 +167,9 @@ function PuzzleProp({ puzzle, chapter }: { puzzle: Puzzle; chapter: Chapter }) {
       className={cn(
         'group relative flex h-full w-full rounded-md border-2 bg-primary-700 font-code hover:bg-primary-600',
         {
-          'border-green-600/30': puzzle.tags?.map((tag) => tag.name.toLowerCase()).includes('easy'),
-          'border-yellow-600/30': puzzle.tags
-            ?.map((tag) => tag.name.toLowerCase())
-            .includes('medium'),
-          'border-red-600/30': puzzle.tags?.map((tag) => tag.name.toLowerCase()).includes('hard'),
+          'border-green-600/30': puzzle.tags?.find((tag) => tag.name.toLowerCase() === 'easy'),
+          'border-yellow-600/30': puzzle.tags?.find((tag) => tag.name.toLowerCase() === 'medium'),
+          'border-red-600/30': puzzle.tags?.find((tag) => tag.name.toLowerCase() === 'hard'),
           'border-highlight-primary': !puzzle.tags?.length,
           'cursor-not-allowed': !isPuzzleAvailable(chapter)
         }
@@ -183,7 +181,7 @@ function PuzzleProp({ puzzle, chapter }: { puzzle: Puzzle; chapter: Chapter }) {
           key={puzzle.id}
           href={`/dashboard/puzzles/${puzzle.id}`}
         >
-          <div className="flex gap-x-2">
+          <div className="flex w-10/12 flex-col gap-2 md:w-full md:flex-row">
             <span className="text-base font-semibold">{puzzle.name}</span>
             {puzzle.tags?.length && (
               <div className="flex gap-x-2 text-sm text-muted">
@@ -323,7 +321,7 @@ function GroupForm({ chapter, token }: { chapter: Chapter; token: string }) {
             <>
               <Select
                 className="w-full"
-                label="Groupes"
+                label="Groupes disponibles"
                 required
                 {...register('name')}
                 options={
diff --git a/ui/ToHTML.tsx b/ui/ToHTML.tsx
index 33a2e73..d6cd91b 100644
--- a/ui/ToHTML.tsx
+++ b/ui/ToHTML.tsx
@@ -10,19 +10,19 @@ export default function ToHTML({ data, className }: { data: string; className?:
     <div className={cn(className)}>
       <Mardown
         components={{
-          a: ({ node, ...props }) => (
+          a: ({ ...props }) => (
             <a
               {...props}
               className="text-brand hover:text-brand/80 hover:underline"
-              download={node}
+              // MAKE thIS SHIT DOWNLOAD
               target="_blank"
-              rel="noreferrer"
+              rel="noopener"
             />
           ),
           code: ({ ...props }) => (
-            <span
+            <code
               {...props}
-              className="cursor-pointer select-none rounded bg-black p-0.5 text-black hover:bg-transparent hover:text-white"
+              className="cursor-pointer select-none text-transparent hover:text-highlight-secondary"
             />
           )
         }}