diff --git a/src/lib/components/Line.svelte b/src/lib/components/Line.svelte
index 84371275..6cfa65db 100644
--- a/src/lib/components/Line.svelte
+++ b/src/lib/components/Line.svelte
@@ -16,12 +16,12 @@
 		{#if external}
 			<span><code>🔗</code></span>
 			<a class="link link-hover text-primary" href={data.url} target="_blank" rel="noreferrer">
-				{data.name}
+					{data.name}
 			</a>
 		{:else if isFile}
 			<span><code>📄</code></span>
 			<a class="link link-hover text-primary" href="{$page.url}/{data.name}">
-				{data.name}
+				{data.name} 
 			</a>
 		{:else}
 			<span><code>📁</code></span>
@@ -29,12 +29,12 @@
 				{data.name}
 			</a>
 		{/if}
-
 		<span class="whitespace-nowrap text-right text-xs self-center">
-			{isFile && data.size ? data.size : '-'}
+			{isFile && data.size ? data.size : '-'} 
+			<!-- <a class="text-lg ml-3" href="{$page.url}/{data.name}" download>📥</a> -->
 		</span>
 		<span class="hidden md:block">
-			{data.time ? formatDate($settings, data.time) : '-'}
+			{data.time ? formatDate($settings, data.time) : '-'} 
 		</span>
 	</div>
 </div>
diff --git a/src/lib/teachings.ts b/src/lib/teachings.ts
index 095c1d40..140bbeab 100644
--- a/src/lib/teachings.ts
+++ b/src/lib/teachings.ts
@@ -2,6 +2,7 @@ export type Teaching = {
 	name: string;
 	url: string;
 	telegram?: string;
+	optional?: boolean;
 };
 
 export type TeachingYear = {
diff --git a/src/routes/ListTeaching.svelte b/src/routes/ListTeaching.svelte
new file mode 100644
index 00000000..62f8503e
--- /dev/null
+++ b/src/routes/ListTeaching.svelte
@@ -0,0 +1,38 @@
+<script lang="ts">
+	import type { Teaching, TeachingYear } from '$lib/teachings';
+    import { base } from '$app/paths';
+    
+    export let years: TeachingYear[]
+    export let activeYears: Teaching[]
+    export let title: string
+</script>
+
+<ul class="menu p-2">
+    {#each years as year}
+    {#if year.teachings.length > 0}
+        <li class="menu-title">
+            <span class="text-2xl mt-5 italic">{year.year} anno {title}</span>
+        </li>
+        <div class="divider mt-0"></div>
+        <div class="flex flex-row flex-wrap">
+            {#each year.teachings as teaching}
+                {@const disabled = !activeYears.includes(teaching)}
+                {@const href = base + '/' + teaching.url}
+                    <a href={disabled ? null : href} class="text-center text-lg">
+                        {#if teaching.name}
+                            <li class="flex flex-row xs:flex-1 justify-center border-base-content items-center m-2 border-2 rounded-md join">
+                                <a href={disabled ? null : href} class="text-center text-lg join-item">
+                                    {teaching.name ? teaching.name : teaching.url}
+                                </a>
+                                {#if teaching.telegram != null}
+                                    <a href="https://t.me/{teaching.telegram}" class="text-center text-lg join-item border-l-2">👥</a>
+                                {/if}
+                            </li>
+                        {/if}
+                    </a>
+            {/each}
+        </div>
+        {/if}
+
+    {/each}
+</ul>
diff --git a/src/routes/dash/[course]/+page.svelte b/src/routes/dash/[course]/+page.svelte
index f9c49dbe..bfdd92fd 100644
--- a/src/routes/dash/[course]/+page.svelte
+++ b/src/routes/dash/[course]/+page.svelte
@@ -3,11 +3,11 @@
 	import type { PageData } from './$types';
 	import { page } from '$app/stores';
 	import { onMount } from 'svelte';
-	import type { Teaching } from '$lib/teachings';
+	import type { Teaching, TeachingYear } from '$lib/teachings';
 	import { getLoginUrl, getWhoAmI } from '$lib/upld';
-
+	import ListTeaching from "../../ListTeaching.svelte";
+	
 	export let data: PageData;
-
 	let activeYears: Teaching[] = [];
 
 	let login:
@@ -16,9 +16,25 @@
 
 	onMount(async () => {
 		activeYears = (await data.streaming?.activeCourses) ?? [];
-
 		login = getWhoAmI(fetch);
 	});
+	
+
+	function filterCoursesOptional(data: PageData, currentIndex = 0, result: {mandatory: TeachingYear[], optional: TeachingYear[]} = { mandatory: [], optional: [] }) {
+		if (currentIndex >= data.course?.years.length!) {
+			return result;
+		}
+
+		const year = data.course?.years[currentIndex];
+		const optionalTeachings = year?.teachings.filter((teaching: Teaching) => teaching.optional);
+		const mandatoryTeachings = year?.teachings.filter((teaching: Teaching) => !teaching.optional);
+		result.mandatory.push({ year: year?.year!, teachings: mandatoryTeachings! });
+		result.optional.push({ year: year?.year!, teachings: optionalTeachings! });
+		return filterCoursesOptional(data, currentIndex + 1, result);
+	}
+
+	$: filteredCourses = filterCoursesOptional(data)
+	
 </script>
 
 <svelte:head>
@@ -50,38 +66,7 @@
 				<a class="btn btn-square btn-ghost" title="Indietro" href="/"> ⬆️ </a>
 			</div>
 		</nav>
-
-		<ul class="menu p-2">
-			{#each data.course.years as year}
-				<li class="menu-title">
-					<span class="text-2xl mt-5 italic">{year.year} anno</span>
-				</li>
-				<div class="divider mt-0"></div>
-				<div class="flex flex-row flex-wrap">
-					{#each year.teachings as teaching}
-						{@const disabled = !activeYears.includes(teaching)}
-						{@const href = base + '/' + teaching.url}
-						<li
-							class:disabled
-							class="flex flex-row xs:flex-1 justify-center border-base-content items-center m-2 border-2 rounded-md join"
-						>
-							<a href={disabled ? null : href} class="text-center text-lg join-item">
-								{#if teaching.name}
-									{teaching.name}
-								{:else}
-									{teaching.url}
-								{/if}
-							</a>
-							{#if teaching.telegram}
-								<a
-									href="https://t.me/{teaching.telegram}"
-									class="text-center text-lg join-item border-l-2">👥</a
-								>
-							{/if}
-						</li>
-					{/each}
-				</div>
-			{/each}
-		</ul>
+		<ListTeaching years={filteredCourses.mandatory} activeYears={activeYears} title={""}/>
+		<ListTeaching years={filteredCourses.optional} activeYears={activeYears} title={"facoltativi"}/>
 	</div>
 {/if}