diff --git a/frontend/src/lib/components/Chart/DonutChart.svelte b/frontend/src/lib/components/Chart/DonutChart.svelte
index 218ec0c05..3d860939b 100644
--- a/frontend/src/lib/components/Chart/DonutChart.svelte
+++ b/frontend/src/lib/components/Chart/DonutChart.svelte
@@ -47,9 +47,8 @@
 				}
 			},
 			legend: {
-				top: 20,
-				// left: 'center',
-				right: 10,
+				top: 'bottom',
+				right: '0',
 				orient: orientation
 			},
 			series: [
@@ -70,7 +69,7 @@
 					emphasis: {
 						label: {
 							show: true,
-							fontSize: '40',
+							fontSize: '24',
 							fontWeight: 'bold'
 						}
 					},
diff --git a/frontend/src/lib/components/Forms/AutocompleteSelect.svelte b/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
index aeb85efb7..86b9b1324 100644
--- a/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
+++ b/frontend/src/lib/components/Forms/AutocompleteSelect.svelte
@@ -59,7 +59,7 @@
 	const default_value = nullable ? null : selectedValues[0];
 
 	$: {
-		$value = multiple ? selectedValues : selectedValues[0] ?? default_value;
+		$value = multiple ? selectedValues : (selectedValues[0] ?? default_value);
 		handleSelectChange();
 	}
 
diff --git a/frontend/src/routes/(app)/analytics/+page.svelte b/frontend/src/routes/(app)/analytics/+page.svelte
index 1c12f4114..e3d0fe716 100644
--- a/frontend/src/routes/(app)/analytics/+page.svelte
+++ b/frontend/src/routes/(app)/analytics/+page.svelte
@@ -203,13 +203,7 @@
 							name="riskScenariosStatus"
 							title={m.riskScenariosStatus()}
 							values={data.riskScenariosPerStatus.values}
-						/>
-						<BarChart
-							classesContainer="basis-1/3 card p-4 bg-white"
-							name="usedMatrices"
-							title={m.usedRiskMatrices()}
-							labels={data.usedRiskMatrices.map((matrix) => matrix.name)}
-							values={data.usedRiskMatrices.map((matrix) => matrix.risk_assessments_count)}
+							orientation="horizontal"
 						/>
 					</div>
 				</section>
diff --git a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/TreeViewItemLead.svelte b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/TreeViewItemLead.svelte
index 4dd466206..ada96e940 100644
--- a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/TreeViewItemLead.svelte
+++ b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/TreeViewItemLead.svelte
@@ -13,8 +13,8 @@
 	export let isScored: boolean;
 	export let max_score: number;
 
-	const leadResult = Object.hasOwn(m, resultI18n) ? m[resultI18n]() : m.notAssessed() ?? '';
-	const lead = Object.hasOwn(m, statusI18n) ? m[statusI18n]() : m.notAssessed() ?? '';
+	const leadResult = Object.hasOwn(m, resultI18n) ? m[resultI18n]() : (m.notAssessed() ?? '');
+	const lead = Object.hasOwn(m, statusI18n) ? m[statusI18n]() : (m.notAssessed() ?? '');
 
 	$: classesText = resultColor == '#000000' ? 'text-white' : '';
 </script>