diff --git a/frontend/src/stopsManager.tsx b/frontend/src/stopsManager.tsx
index 2d36b3f..4d3c6b7 100644
--- a/frontend/src/stopsManager.tsx
+++ b/frontend/src/stopsManager.tsx
@@ -205,25 +205,19 @@ export const StopsManager: VoidComponent = () => {
 			</Progress>
 			<Box w="100%" h="40%" borderWidth="1px" borderColor="var(--idfm-black)" borderRadius="$lg" overflow="scroll" marginBottom="2px">
 				<List width="100%" height="100%">
-					{() => {
-						const items = [];
-						for (const stop of foundStops().sort((x, y) => x.name.localeCompare(y.name))) {
-							items.push(
-								<ListItem borderWidth="1px" mb="0px" color="var(--idfm-black)" borderRadius="$lg">
-									<Button fullWidth="true" color="var(--idfm-black)" bg="white" onClick={() => {
-										console.log(`${stop.id} clicked !!!`);
-										setDisplayedStops([stop]);
-									}}>
-										<Box w="100%" h="100%">
-											<Show when={stop.stops !== undefined} fallback={<StopRepr stop={stop} />}>
-												<StopAreaRepr stop={stop} />
-											</Show>
-										</Box>
-									</Button>
-								</ListItem>);
+					<For each={foundStops().sort((x, y) => x.name.localeCompare(y.name))}>
+						{(stop) =>
+							<ListItem borderWidth="1px" mb="0px" color="var(--idfm-black)" borderRadius="$lg">
+								<Button fullWidth="true" color="var(--idfm-black)" bg="white" onClick={() => setDisplayedStops([stop])}>
+									<Box w="100%" h="100%">
+										<Show when={stop.stops !== undefined} fallback={<StopRepr stop={stop} />}>
+											<StopAreaRepr stop={stop} />
+										</Show>
+									</Box>
+								</Button>
+							</ListItem>
 						}
-						return items;
-					}}
+					</For>
 				</List>
 			</Box>
 			<Box borderWidth="1px" borderColor="var(--idfm-black)" borderRadius="$lg" h="55%" w="100%" overflow="scroll">