diff --git a/src/components/StandalonePage.svelte b/src/components/StandalonePage.svelte
index f523fbe..b8a72b4 100644
--- a/src/components/StandalonePage.svelte
+++ b/src/components/StandalonePage.svelte
@@ -8,6 +8,6 @@
 	let { children } = $props();
 </script>
 
-<div class="mx-auto h-full max-w-5xl overflow-y-auto">
+<div class="mx-auto h-full max-w-5xl overflow-y-auto p-4">
 	{@render children?.()}
 </div>
diff --git a/src/components/containers/AccordionItem.svelte b/src/components/containers/AccordionItem.svelte
index ce0466a..9b3d45f 100644
--- a/src/components/containers/AccordionItem.svelte
+++ b/src/components/containers/AccordionItem.svelte
@@ -21,7 +21,7 @@
 </script>
 
 <div class="relative">
-	<div class="sticky top-0 z-10 bg-white dark:bg-gray-800">
+	<div class="sticky top-0 z-10 bg-white px-4 dark:bg-gray-800">
 		<button
 			type="button"
 			class="flex w-full items-center justify-between py-3 text-left text-base font-medium text-gray-500 hover:text-gray-900 dark:text-gray-400 dark:hover:text-white"
diff --git a/src/components/schedule-for-stop/RouteScheduleTable.svelte b/src/components/schedule-for-stop/RouteScheduleTable.svelte
index fa1a20a..ac6073f 100644
--- a/src/components/schedule-for-stop/RouteScheduleTable.svelte
+++ b/src/components/schedule-for-stop/RouteScheduleTable.svelte
@@ -63,11 +63,12 @@
 						>
 							{formatHour(hour)} <span class="text-sm text-gray-600 dark:text-gray-100">AM</span>
 						</td>
-						<td class="border px-6 py-3 text-lg dark:border-gray-700 dark:text-white">
+						<td
+							class="flex items-start gap-3 border px-6 py-3 text-lg underline dark:border-gray-700 dark:text-white"
+						>
 							{#each times as stopTime, index (index)}
 								<span>
 									{extractMinutes(stopTime.arrivalTime)}
-									{index < times.length - 1 ? ', ' : ''}
 								</span>
 							{/each}
 						</td>
@@ -96,11 +97,12 @@
 						>
 							{formatHour(hour)} <span class="text-sm text-gray-600 dark:text-gray-100">PM</span>
 						</td>
-						<td class="border px-6 py-3 text-lg dark:border-gray-700 dark:text-white">
+						<td
+							class="flex items-start gap-3 border px-6 py-3 text-lg underline dark:border-gray-700 dark:text-white"
+						>
 							{#each times as stopTime, index (index)}
 								<span>
 									{extractMinutes(stopTime.arrivalTime)}
-									{index < times.length - 1 ? ', ' : ''}
 								</span>
 							{/each}
 						</td>
diff --git a/src/routes/stops/[stopID]/schedule/+page.svelte b/src/routes/stops/[stopID]/schedule/+page.svelte
index 627f2b2..f5c684c 100644
--- a/src/routes/stops/[stopID]/schedule/+page.svelte
+++ b/src/routes/stops/[stopID]/schedule/+page.svelte
@@ -21,6 +21,7 @@
 	let stopDirection = $state('');
 	let loading = $state(true);
 	let accordionComponent = $state();
+	let allRoutesExpanded = $state(false);
 
 	let schedulesMap = new Map();
 	let routeReference = new Map();
@@ -105,6 +106,15 @@
 		return grouped;
 	}
 
+	function toggleAllRoutes() {
+		if (allRoutesExpanded) {
+			accordionComponent.closeAll();
+		} else {
+			accordionComponent.openAll();
+		}
+		allRoutesExpanded = !allRoutesExpanded;
+	}
+
 	onMount(async () => {
 		const formattedDate = currentDate.toISOString().split('T')[0];
 		await fetchScheduleForStop(stopId, formattedDate);
@@ -143,22 +153,21 @@
 				</h2>
 
 				<div class="mb-4 flex gap-4">
-					<div class="min-w-32">
+					<div class="z-20 w-[30%] min-w-32">
 						<Datepicker bind:value={selectedDate} inputClass="w-96" />
 					</div>
 
 					<div class="flex-1 text-right">
-						<button class="button" onclick={() => accordionComponent.openAll()}>
-							{$t('schedule_for_stop.show_all_routes')}
-						</button>
-						<button class="button" onclick={() => accordionComponent.closeAll()}>
-							{$t('schedule_for_stop.collapse_all_routes')}
+						<button class="button" onclick={toggleAllRoutes}>
+							{allRoutesExpanded
+								? $t('schedule_for_stop.collapse_all_routes')
+								: $t('schedule_for_stop.show_all_routes')}
 						</button>
 					</div>
 				</div>
 
 				<div
-					class="flex-1 rounded-lg border border-gray-200 bg-white p-6 dark:border-gray-700 dark:bg-black"
+					class="flex-1 rounded-lg border border-gray-200 bg-white p-2 dark:border-gray-700 dark:bg-black"
 				>
 					{#if emptySchedules}
 						<p class="text-center text-gray-700 dark:text-gray-400">