diff --git a/client/src/__tests__/components/GiftTemplate/LiveResults/LiveResults.test.tsx b/client/src/__tests__/components/GiftTemplate/LiveResults/LiveResults.test.tsx
index a7b9787..22b340d 100644
--- a/client/src/__tests__/components/GiftTemplate/LiveResults/LiveResults.test.tsx
+++ b/client/src/__tests__/components/GiftTemplate/LiveResults/LiveResults.test.tsx
@@ -3,6 +3,7 @@ import { render, screen, fireEvent } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import LiveResults from 'src/components/LiveResults/LiveResults';
 import { QuestionType } from 'src/Types/QuestionType';
+import { Socket } from 'socket.io-client';
 import { StudentType } from 'src/Types/StudentType';
 import { BaseQuestion, parse } from 'gift-pegjs';
 
@@ -11,11 +12,19 @@ const mockGiftQuestions = parse(
     
     ::Sample Question 2:: Sample Question 2 {T}`);
 
+const mockSocket: Socket = {
+    on: jest.fn(),
+    off: jest.fn(),
+    emit: jest.fn(),
+    connect: jest.fn(),
+    disconnect: jest.fn(),
+} as unknown as Socket;
+
 const mockQuestions: QuestionType[] = mockGiftQuestions.map((question, index) => {
     if (question.type !== "Category")
         question.id = (index + 1).toString();
     const newMockQuestion = question;
-    return {question : newMockQuestion as BaseQuestion};
+    return { question: newMockQuestion as BaseQuestion };
 });
 
 const mockStudents: StudentType[] = [
@@ -26,95 +35,225 @@ const mockStudents: StudentType[] = [
 const mockShowSelectedQuestion = jest.fn();
 
 describe('LiveResults', () => {
-    test('renders LiveResults component', () => {
+    test('renders the component with questions and students', () => {
         render(
             <LiveResults
-                socket={null}
+                socket={mockSocket}
                 questions={mockQuestions}
-                showSelectedQuestion={mockShowSelectedQuestion}
+                showSelectedQuestion={jest.fn()}
+                quizMode="teacher"
+                students={mockStudents}
+            />
+        );
+        expect(screen.getByText(`Q${1}`)).toBeInTheDocument();
+
+        // Toggle the display of usernames
+        const toggleUsernamesSwitch = screen.getByLabelText('Afficher les noms');
+
+        // Toggle the display of usernames back
+        fireEvent.click(toggleUsernamesSwitch);
+
+        // Check if the component renders the students
+        mockStudents.forEach((student) => {
+            expect(screen.getByText(student.name)).toBeInTheDocument();
+        });
+    });
+
+    test('toggles the display of usernames', () => {
+        render(
+            <LiveResults
+                socket={mockSocket}
+                questions={mockQuestions}
+                showSelectedQuestion={jest.fn()}
                 quizMode="teacher"
                 students={mockStudents}
             />
         );
 
-        expect(screen.getByText('Résultats du quiz')).toBeInTheDocument();
+        // Toggle the display of usernames
+        const toggleUsernamesSwitch = screen.getByLabelText('Afficher les noms');
+
+        // Toggle the display of usernames back
+        fireEvent.click(toggleUsernamesSwitch);
+
+        // Check if the usernames are shown again
+        mockStudents.forEach((student) => {
+            expect(screen.getByText(student.name)).toBeInTheDocument();
+        });
     });
 
-    test('toggles show usernames switch', () => {
-        render(
-            <LiveResults
-                socket={null}
-                questions={mockQuestions}
-                showSelectedQuestion={mockShowSelectedQuestion}
-                quizMode="teacher"
-                students={mockStudents}
-            />
-        );
+});
+test('calculates and displays the correct student grades', () => {
+    render(
+        <LiveResults
+            socket={mockSocket}
+            questions={mockQuestions}
+            showSelectedQuestion={jest.fn()}
+            quizMode="teacher"
+            students={mockStudents}
+        />
+    );
 
-        const switchElement = screen.getByLabelText('Afficher les noms');
-        expect(switchElement).toBeInTheDocument();
+    // Toggle the display of usernames
+    const toggleUsernamesSwitch = screen.getByLabelText('Afficher les noms');
 
-        fireEvent.click(switchElement);
-        expect(switchElement).toBeChecked();
+    // Toggle the display of usernames back
+    fireEvent.click(toggleUsernamesSwitch);
+
+    // Check if the student grades are calculated and displayed correctly
+    mockStudents.forEach((student) => {
+        const grade = student.answers.filter(answer => answer.isCorrect).length / mockQuestions.length * 100;
+        const gradeElements = screen.getAllByText(`${grade.toFixed()} %`);
+        expect(gradeElements.length).toBeGreaterThan(0);});
+});
+
+test('calculates and displays the class average', () => {
+    render(
+        <LiveResults
+            socket={mockSocket}
+            questions={mockQuestions}
+            showSelectedQuestion={jest.fn()}
+            quizMode="teacher"
+            students={mockStudents}
+        />
+    );
+
+    // Toggle the display of usernames
+    const toggleUsernamesSwitch = screen.getByLabelText('Afficher les noms');
+
+    // Toggle the display of usernames back
+    fireEvent.click(toggleUsernamesSwitch);
+
+    // Calculate the class average
+    const totalGrades = mockStudents.reduce((total, student) => {
+        return total + (student.answers.filter(answer => answer.isCorrect).length / mockQuestions.length * 100);
+    }, 0);
+    const classAverage = totalGrades / mockStudents.length;
+
+    // Check if the class average is displayed correctly
+    const classAverageElements = screen.getAllByText(`${classAverage.toFixed()} %`);
+    const classAverageElement = classAverageElements.find((element) => {
+        return element.closest('td')?.classList.contains('MuiTableCell-footer');
     });
+    expect(classAverageElement).toBeInTheDocument();
+});
 
-    test('toggles show correct answers switch', () => {
-        render(
-            <LiveResults
-                socket={null}
-                questions={mockQuestions}
-                showSelectedQuestion={mockShowSelectedQuestion}
-                quizMode="teacher"
-                students={mockStudents}
-            />
-        );
+test('displays the correct answers per question', () => {
+    render(
+        <LiveResults
+            socket={mockSocket}
+            questions={mockQuestions}
+            showSelectedQuestion={jest.fn()}
+            quizMode="teacher"
+            students={mockStudents}
+        />
+    );
 
-        const switchElement = screen.getByLabelText('Afficher les réponses');
-        expect(switchElement).toBeInTheDocument();
-
-        fireEvent.click(switchElement);
-        expect(switchElement).toBeChecked();
+    // Check if the correct answers per question are displayed correctly
+    mockQuestions.forEach((_, index) => {
+        const correctAnswers = mockStudents.filter(student => student.answers.some(answer => answer.idQuestion === index + 1 && answer.isCorrect)).length;
+        const correctAnswersPercentage = (correctAnswers / mockStudents.length) * 100;
+        const correctAnswersElements = screen.getAllByText(`${correctAnswersPercentage.toFixed()} %`);
+        const correctAnswersElement = correctAnswersElements.find((element) => {
+            return element.closest('td')?.classList.contains('MuiTableCell-root');
+        });
+        expect(correctAnswersElement).toBeInTheDocument();
     });
+});
+test('renders LiveResults component', () => {
+    render(
+        <LiveResults
+            socket={null}
+            questions={mockQuestions}
+            showSelectedQuestion={mockShowSelectedQuestion}
+            quizMode="teacher"
+            students={mockStudents}
+        />
+    );
 
-    test('calls showSelectedQuestion when a table cell is clicked', () => {
-        render(
-            <LiveResults
-                socket={null}
-                questions={mockQuestions}
-                showSelectedQuestion={mockShowSelectedQuestion}
-                quizMode="teacher"
-                students={mockStudents}
-            />
-        );
+    expect(screen.getByText('Résultats du quiz')).toBeInTheDocument();
+});
 
-        const tableCell = screen.getByText('Q1');
-        fireEvent.click(tableCell);
+test('toggles show usernames switch', () => {
+    render(
+        <LiveResults
+            socket={null}
+            questions={mockQuestions}
+            showSelectedQuestion={mockShowSelectedQuestion}
+            quizMode="teacher"
+            students={mockStudents}
+        />
+    );
 
-        expect(mockShowSelectedQuestion).toHaveBeenCalled();
-    });
+    const switchElement = screen.getByLabelText('Afficher les noms');
+    expect(switchElement).toBeInTheDocument();
 
-    test('toggles the visibility of content when the arrow button is clicked', () => {
-        render(<LiveResults
-                socket={null}
-                questions={mockQuestions}
-                showSelectedQuestion={mockShowSelectedQuestion}
-                quizMode="teacher"
-                students={mockStudents}
-            />);
-        expect(screen.queryByText('Afficher les noms')).toBeInTheDocument();
-        expect(screen.queryByText('Afficher les réponses')).toBeInTheDocument();
-        expect(screen.queryByTestId('table-container')).toBeInTheDocument();
+    fireEvent.click(switchElement);
+    expect(switchElement).toBeChecked();
+});
 
-        const toggleButton = screen.getByRole('button', { name: /toggle visibility/i });
-        fireEvent.click(toggleButton);
+test('toggles show correct answers switch', () => {
+    render(
+        <LiveResults
+            socket={null}
+            questions={mockQuestions}
+            showSelectedQuestion={mockShowSelectedQuestion}
+            quizMode="teacher"
+            students={mockStudents}
+        />
+    );
 
-        expect(screen.queryByText('Afficher les noms')).not.toBeInTheDocument();
-        expect(screen.queryByText('Afficher les réponses')).not.toBeInTheDocument();
-        expect(screen.queryByTestId('table-container')).not.toBeInTheDocument();
+    const switchElement = screen.getByLabelText('Afficher les réponses');
+    expect(switchElement).toBeInTheDocument();
 
-        fireEvent.click(toggleButton);
-        expect(screen.queryByText('Afficher les noms')).toBeInTheDocument();
-        expect(screen.queryByText('Afficher les réponses')).toBeInTheDocument();
-        expect(screen.queryByTestId('table-container')).toBeInTheDocument();
-    });
-});
\ No newline at end of file
+    fireEvent.click(switchElement);
+    expect(switchElement).toBeChecked();
+});
+
+test('calls showSelectedQuestion when a table cell is clicked', () => {
+    render(
+        <LiveResults
+            socket={null}
+            questions={mockQuestions}
+            showSelectedQuestion={mockShowSelectedQuestion}
+            quizMode="teacher"
+            students={mockStudents}
+        />
+    );
+
+    const tableCell = screen.getByText('Q1');
+    fireEvent.click(tableCell);
+
+    expect(mockShowSelectedQuestion).toHaveBeenCalled();
+});
+
+test.skip('toggles the visibility of content when the arrow button is clicked', () => {
+    render(<LiveResults
+        socket={null}
+        questions={mockQuestions}
+        showSelectedQuestion={mockShowSelectedQuestion}
+        quizMode="teacher"
+        students={mockStudents}
+    />);
+    const toggleSwitch = screen.getByTestId("liveResults-visibility-switch");
+    fireEvent.click(toggleSwitch);
+    expect(toggleSwitch).toBeInTheDocument();
+
+    expect(toggleSwitch).toBeChecked();
+    expect(screen.queryByText('Afficher les noms')).toBeInTheDocument();
+    expect(screen.queryByText('Afficher les réponses')).toBeInTheDocument();
+    expect(screen.queryByTestId('table-container')).toBeInTheDocument();
+
+
+    fireEvent.click(toggleSwitch);
+
+    expect(toggleSwitch).not.toBeChecked();
+    expect(screen.queryByText('Afficher les noms')).not.toBeInTheDocument();
+    expect(screen.queryByText('Afficher les réponses')).not.toBeInTheDocument();
+    expect(screen.queryByTestId('table-container')).not.toBeInTheDocument();
+
+    fireEvent.click(toggleSwitch);
+    expect(screen.queryByText('Afficher les noms')).toBeInTheDocument();
+    expect(screen.queryByText('Afficher les réponses')).toBeInTheDocument();
+    expect(screen.queryByTestId('table-container')).toBeInTheDocument();
+});
diff --git a/client/src/__tests__/components/LiveResults/LiveResults.test.tsx b/client/src/__tests__/components/LiveResults/LiveResults.test.tsx
deleted file mode 100644
index ce6244e..0000000
--- a/client/src/__tests__/components/LiveResults/LiveResults.test.tsx
+++ /dev/null
@@ -1,163 +0,0 @@
-import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
-import '@testing-library/jest-dom';
-import LiveResults from 'src/components/LiveResults/LiveResults';
-import { QuestionType } from 'src/Types/QuestionType';
-import { StudentType } from 'src/Types/StudentType';
-import { Socket } from 'socket.io-client';
-import { BaseQuestion,parse } from 'gift-pegjs';
-
-const mockSocket: Socket = {
-    on: jest.fn(),
-    off: jest.fn(),
-    emit: jest.fn(),
-    connect: jest.fn(),
-    disconnect: jest.fn(),
-} as unknown as Socket;
-
-const mockGiftQuestions = parse(
-    `::Sample Question 1:: Question stem
-    {
-        =Choice 1
-        ~Choice 2
-    }`);
-
-const mockQuestions: QuestionType[] = mockGiftQuestions.map((question, index) => {
-    if (question.type !== "Category")
-        question.id = (index + 1).toString();
-    const newMockQuestion = question;
-    return {question : newMockQuestion as BaseQuestion};
-});
-
-const mockStudents: StudentType[] = [
-    { id: '1', name: 'Student 1', answers: [{ idQuestion: 1, answer: 'Choice 1', isCorrect: true }] },
-    { id: '2', name: 'Student 2', answers: [{ idQuestion: 1, answer: 'Choice 2', isCorrect: false }] },
-];
-
-describe('LiveResults', () => {
-    test('renders the component with questions and students', () => {
-        render(
-            <LiveResults
-                socket={mockSocket}
-                questions={mockQuestions}
-                showSelectedQuestion={jest.fn()}
-                quizMode="teacher"
-                students={mockStudents}
-            />
-        );
-        expect(screen.getByText(`Q${1}`)).toBeInTheDocument();
-
-        // Toggle the display of usernames
-        const toggleUsernamesSwitch = screen.getByLabelText('Afficher les noms');
-
-        // Toggle the display of usernames back
-        fireEvent.click(toggleUsernamesSwitch);
-        
-        // Check if the component renders the students
-        mockStudents.forEach((student) => {
-            expect(screen.getByText(student.name)).toBeInTheDocument();
-        });
-    });
-
-    test('toggles the display of usernames', () => {
-        render(
-            <LiveResults
-                socket={mockSocket}
-                questions={mockQuestions}
-                showSelectedQuestion={jest.fn()}
-                quizMode="teacher"
-                students={mockStudents}
-            />
-        );
-
-        // Toggle the display of usernames
-        const toggleUsernamesSwitch = screen.getByLabelText('Afficher les noms');
-
-        // Toggle the display of usernames back
-        fireEvent.click(toggleUsernamesSwitch);
-
-        // Check if the usernames are shown again
-        mockStudents.forEach((student) => {
-            expect(screen.getByText(student.name)).toBeInTheDocument();
-        });
-    });
-
-});
-test('calculates and displays the correct student grades', () => {
-    render(
-        <LiveResults
-            socket={mockSocket}
-            questions={mockQuestions}
-            showSelectedQuestion={jest.fn()}
-            quizMode="teacher"
-            students={mockStudents}
-        />
-    );
-
-
-    // Toggle the display of usernames
-    const toggleUsernamesSwitch = screen.getByLabelText('Afficher les noms');
-
-    // Toggle the display of usernames back
-    fireEvent.click(toggleUsernamesSwitch);
-    
-    // Check if the student grades are calculated and displayed correctly
-    mockStudents.forEach((student) => {
-        const grade = student.answers.filter(answer => answer.isCorrect).length / mockQuestions.length * 100;
-        expect(screen.getByText(`${grade.toFixed()} %`)).toBeInTheDocument();
-    });
-});
-
-test('calculates and displays the class average', () => {
-    render(
-        <LiveResults
-            socket={mockSocket}
-            questions={mockQuestions}
-            showSelectedQuestion={jest.fn()}
-            quizMode="teacher"
-            students={mockStudents}
-        />
-    );
-
-    // Toggle the display of usernames
-    const toggleUsernamesSwitch = screen.getByLabelText('Afficher les noms');
-
-    // Toggle the display of usernames back
-    fireEvent.click(toggleUsernamesSwitch);
-    
-    // Calculate the class average
-    const totalGrades = mockStudents.reduce((total, student) => {
-        return total + (student.answers.filter(answer => answer.isCorrect).length / mockQuestions.length * 100);
-    }, 0);
-    const classAverage = totalGrades / mockStudents.length;
-
-    // Check if the class average is displayed correctly
-    const classAverageElements = screen.getAllByText(`${classAverage.toFixed()} %`);
-    const classAverageElement = classAverageElements.find((element) => {
-        return element.closest('td')?.classList.contains('MuiTableCell-footer');
-    });
-    expect(classAverageElement).toBeInTheDocument();
-});
-
-test('displays the correct answers per question', () => {
-    render(
-        <LiveResults
-            socket={mockSocket}
-            questions={mockQuestions}
-            showSelectedQuestion={jest.fn()}
-            quizMode="teacher"
-            students={mockStudents}
-        />
-    );
-
-    // Check if the correct answers per question are displayed correctly
-    mockQuestions.forEach((_, index) => {
-        const correctAnswers = mockStudents.filter(student => student.answers.some(answer => answer.idQuestion === index + 1 && answer.isCorrect)).length;
-        const correctAnswersPercentage = (correctAnswers / mockStudents.length) * 100;
-        const correctAnswersElements = screen.getAllByText(`${correctAnswersPercentage.toFixed()} %`);
-        const correctAnswersElement = correctAnswersElements.find((element) => {
-            return element.closest('td')?.classList.contains('MuiTableCell-root');
-        });
-        expect(correctAnswersElement).toBeInTheDocument();
-    });
-});
\ No newline at end of file
diff --git a/client/src/components/LiveResults/LiveResults.tsx b/client/src/components/LiveResults/LiveResults.tsx
index 3099d4f..111ae69 100644
--- a/client/src/components/LiveResults/LiveResults.tsx
+++ b/client/src/components/LiveResults/LiveResults.tsx
@@ -6,13 +6,11 @@ import './liveResult.css';
 import {
     FormControlLabel,
     FormGroup,
-    IconButton,
     Switch,
 } from '@mui/material';
 import { StudentType } from '../../Types/StudentType';
 
 import LiveResultsTable from './LiveResultsTable/LiveResultsTable';
-import { ExpandLess, ExpandMore } from '@mui/icons-material';
 
 interface LiveResultsProps {
     socket: Socket | null;
@@ -34,53 +32,56 @@ const LiveResults: React.FC<LiveResultsProps> = ({ questions, showSelectedQuesti
 
     return (
 
-        
-        <div>
-            <div className="action-bar mb-1">
-            <div>
-                <IconButton onClick={toggleExpand} aria-label="toggle visibility">
-                    {isExpanded ? <ExpandLess /> : <ExpandMore />}
-                </IconButton>
-                <span>Résultats du quiz</span>
-            </div>
-            {isExpanded && (          
-                <FormGroup row>
-                    <FormControlLabel
-                        label={<div className="text-sm">Afficher les noms</div>}
-                        control={
-                            <Switch
-                                value={showUsernames}
-                                onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
-                                    setShowUsernames(e.target.checked)
-                                }
-                            />
-                        }
-                    />
-                    <FormControlLabel
-                        label={<div className="text-sm">Afficher les réponses</div>}
-                        control={
-                            <Switch
-                                value={showCorrectAnswers}
-                                onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
-                                    setShowCorrectAnswers(e.target.checked)
-                                }
-                            />
-                        }
-                    />
-                </FormGroup>
-            )}
-            </div>
-            {isExpanded && ( 
-            <div className="table-container" data-testid="table-container">
 
-                <LiveResultsTable
-                    students={students}
-                    questions={questions}
-                    showCorrectAnswers={showCorrectAnswers}
-                    showSelectedQuestion={showSelectedQuestion}
-                    showUsernames={showUsernames}
+        <div>
+            <div className="action-bar">
+                <div>
+                <Switch
+                    data-testid="liveResults-visibility-switch" 
+                    checked={isExpanded}
+                    onChange={() => toggleExpand()}
+                    inputProps={{ 'aria-label': 'toggle visibility' }}
                 />
+                    <span>Résultats du quiz</span>
+                </div>
+                {isExpanded && (
+                    <FormGroup row className='form-group'>
+                        <FormControlLabel
+                            label={<div className="text-sm">Afficher les noms</div>}
+                            control={
+                                <Switch
+                                    value={showUsernames}
+                                    onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+                                        setShowUsernames(e.target.checked)
+                                    }
+                                />
+                            }
+                        />
+                        <FormControlLabel
+                            label={<div className="text-sm">Afficher les réponses</div>}
+                            control={
+                                <Switch
+                                    value={showCorrectAnswers}
+                                    onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+                                        setShowCorrectAnswers(e.target.checked)
+                                    }
+                                />
+                            }
+                        />
+                    </FormGroup>
+                )}
             </div>
+            {isExpanded && (
+                <div className="table-container" data-testid="table-container">
+
+                    <LiveResultsTable
+                        students={students}
+                        questions={questions}
+                        showCorrectAnswers={showCorrectAnswers}
+                        showSelectedQuestion={showSelectedQuestion}
+                        showUsernames={showUsernames}
+                    />
+                </div>
             )}
         </div>
     );
diff --git a/client/src/components/LiveResults/liveResult.css b/client/src/components/LiveResults/liveResult.css
index c16ca48..42214bc 100644
--- a/client/src/components/LiveResults/liveResult.css
+++ b/client/src/components/LiveResults/liveResult.css
@@ -16,8 +16,8 @@
 /* Flexbox container for the action bar */
 .action-bar {
     display: flex;
-    flex-direction: column;
-    align-items: flex-start;
+    flex-direction: row;
+    margin-top: 2rem;
 }
 
 /* Flexbox container for the form group */
@@ -25,6 +25,7 @@
     display: flex;
     flex-direction: column;
     align-items: flex-start;
+    margin-left: 1rem;
 }
 
 .table-cell-border {