diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 55e1ccf79..6d71c79a4 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -747,7 +747,7 @@
 	"createAppliedControlsFromSuggestionsError": "An error occured while creating applied controls from the suggested reference controls",
 	"createAppliedControlsFromSuggestionsConfirmMessage": "{count} applied controls will be created from the suggested reference controls. Do you want to proceed?",
 	"theFollowingControlsWillBeAddedColon": "The following controls will be added:",
-	"ShowAllNodesMessage": "Show all nodes",
-	"ShowOnlyAssessable": "Only assessable nodes",
+	"ShowAllNodesMessage": "Show all",
+	"ShowOnlyAssessable": "Only assessable",
 	"NoPreviewMessage": "No preview available."
 }
diff --git a/frontend/messages/fr.json b/frontend/messages/fr.json
index 931c4304e..ead1bfa1b 100644
--- a/frontend/messages/fr.json
+++ b/frontend/messages/fr.json
@@ -680,6 +680,6 @@
 	"createAppliedControlsFromSuggestionsError": "Une erreur s'est produite lors de la création des mesures appliquées depuis les suggestions",
 	"createAppliedControlsFromSuggestionsConfirmMessage": "{count} mesures appliquées seront créées à partir des suggestions. Voulez-vous continuer ?",
 	"theFollowingControlsWillBeAddedColon": "Les mesures suivantes seront appliquées :",
-	"ShowAllNodesMessage": "Tous les noeuds",
-	"ShowOnlyAssessable": "uniquement les nœuds évaluables"
+	"ShowAllNodesMessage": "Tous afficher",
+	"ShowOnlyAssessable": "uniquement évaluables"
 }
diff --git a/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/+page.svelte
index 5091b9050..7b70bda79 100644
--- a/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/+page.svelte
+++ b/frontend/src/routes/(app)/(third-party)/compliance-assessments/[id=uuid]/+page.svelte
@@ -382,34 +382,34 @@
 	</div>
 	{#if !$page.data.user.is_third_party}
 		<div class="card px-6 py-4 bg-white flex flex-col shadow-lg">
-			<h4 class="h4 flex items-center font-semibold">
-				{m.associatedRequirements()}
+			<div class=" flex items-center font-semibold">
+				<span class="h4">{m.associatedRequirements()}</span>
 				<span class="badge variant-soft-primary ml-1">
 					{assessableNodesCount(treeViewNodes)}
 				</span>
-			</h4>
-
-			<div class="flex items-center justify-center space-x-4">
-				{#if $displayOnlyAssessableNodes}
-					<p class="font-bold text-sm">{m.ShowAllNodesMessage()}</p>
-				{:else}
-					<p class="font-bold text-sm text-green-500">{m.ShowAllNodesMessage()}</p>
-				{/if}
-				<SlideToggle
-					name="questionnaireToggle"
-					class="flex flex-row items-center justify-center"
-					active="bg-primary-500"
-					background="bg-green-500"
-					bind:checked={$displayOnlyAssessableNodes}
-					on:click={() => ($displayOnlyAssessableNodes = !$displayOnlyAssessableNodes)}
-				>
+				<div id="toggle" class="flex items-center justify-center space-x-4 text-xs ml-auto mr-4">
 					{#if $displayOnlyAssessableNodes}
-						<p class="font-bold text-sm text-primary-500">{m.ShowOnlyAssessable()}</p>
+						<p class="font-bold">{m.ShowAllNodesMessage()}</p>
 					{:else}
-						<p class="font-bold text-sm">{m.ShowOnlyAssessable()}</p>
+						<p class="font-bold text-green-500">{m.ShowAllNodesMessage()}</p>
 					{/if}
-				</SlideToggle>
+					<SlideToggle
+						name="questionnaireToggle"
+						class="flex flex-row items-center justify-center"
+						active="bg-primary-500"
+						background="bg-green-500"
+						bind:checked={$displayOnlyAssessableNodes}
+						on:click={() => ($displayOnlyAssessableNodes = !$displayOnlyAssessableNodes)}
+					>
+						{#if $displayOnlyAssessableNodes}
+							<p class="font-bold text-primary-500">{m.ShowOnlyAssessable()}</p>
+						{:else}
+							<p class="font-bold">{m.ShowOnlyAssessable()}</p>
+						{/if}
+					</SlideToggle>
+				</div>
 			</div>
+
 			<div class="flex items-center my-2 text-xs space-x-2 text-gray-500">
 				<i class="fa-solid fa-diagram-project" />
 				<p>{m.mappingInferenceTip()}</p>