diff --git a/schema.graphql b/schema.graphql
index 61540c8..0b1c17f 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -499,7 +499,8 @@ type Query {
   primussExams: [PrimussExamByProgram]
   primussExamsForAnCode(ancode: Int!): [PrimussExam!]
   rooms: [Room!]!
-  roomsForSlot(day: Int!, time: Int!): SlotWithRooms
+  roomsForSlot(day: Int!, time: Int!): RoomsForSlot
+  roomsForSlots: [RoomsForSlot!]!
   roomsWithConstraints(exahm: Boolean, handicap: Boolean!, lab: Boolean!, placesWithSocket: Boolean!): [Room!]!
   roomsWithInvigilationsForSlot(day: Int!, time: Int!): InvigilationSlot
   semester: Semester!
@@ -583,6 +584,12 @@ type RoomWithInvigilator {
   studentCount: Int!
 }
 
+type RoomsForSlot {
+  day: Int!
+  rooms: [Room!]!
+  slot: Int!
+}
+
 type Semester {
   id: String!
 }
@@ -613,15 +620,6 @@ type SlotWithExamGroups {
   slotNumber: Int!
 }
 
-type SlotWithRooms {
-  dayNumber: Int!
-  exahmRooms: [Room!]!
-  labRooms: [Room!]!
-  normalRooms: [Room!]!
-  ntaRooms: [Room!]!
-  slotNumber: Int!
-}
-
 type Starttime {
   number: Int!
   start: String!
diff --git a/src/lib/Nav.svelte b/src/lib/Nav.svelte
index f5430d3..e2ce37d 100644
--- a/src/lib/Nav.svelte
+++ b/src/lib/Nav.svelte
@@ -86,7 +86,7 @@
 				<li><a href="/plan/calendar">Kalenderansicht</a></li>
 				<!-- <li><a href="/plan/ntas">geplante Prüfungen mit NTAs</a></li> -->
 				<li><a href="/plan/rooms">Raumplanung</a></li>
-				<li><a href="/plan/roomsTable">Raumplanung (Tabelle)</a></li>
+				<li><a href="/plan/roomsForSlots">Verfügbare Räume</a></li>
 				<li><a href="/plan/invigilation/1">Aufsichtenplanung</a></li>
 				<li><a href="/plan/examsInPlanZPA">Prüfungsliste für ZPA</a></li>
 			</ul>
diff --git a/src/routes/plan/calendar/+page.gql b/src/routes/plan/calendar/+page.server.gql
similarity index 100%
rename from src/routes/plan/calendar/+page.gql
rename to src/routes/plan/calendar/+page.server.gql
diff --git a/src/routes/plan/roomsForSlots/+page.server.gql b/src/routes/plan/roomsForSlots/+page.server.gql
new file mode 100644
index 0000000..60b9aa5
--- /dev/null
+++ b/src/routes/plan/roomsForSlots/+page.server.gql
@@ -0,0 +1,26 @@
+query RoomsForSlots {
+	rooms {
+		name
+		seats
+		handicap
+		lab
+		placesWithSocket
+		exahm
+		seb
+		needsRequest
+	}
+	roomsForSlots {
+		day
+		slot
+		rooms {
+			name
+			seats
+			handicap
+			lab
+			placesWithSocket
+			exahm
+			seb
+			needsRequest
+		}
+	}
+}
diff --git a/src/routes/plan/roomsForSlots/+page.svelte b/src/routes/plan/roomsForSlots/+page.svelte
new file mode 100644
index 0000000..78403ab
--- /dev/null
+++ b/src/routes/plan/roomsForSlots/+page.svelte
@@ -0,0 +1,77 @@
+<script lang="ts">
+	import type { PageData } from './$houdini';
+	export let data: PageData;
+
+	$: ({ RoomsForSlots } = data);
+
+	let selectedDays: number[] = [];
+	let availableDays: number[] = [];
+
+	$: if ($RoomsForSlots?.data?.roomsForSlots) {
+		availableDays = [...new Set($RoomsForSlots.data.roomsForSlots.map((slot) => slot.day))].sort(
+			(a, b) => a - b
+		);
+	}
+
+	$: filteredSlots =
+		selectedDays.length === 0
+			? $RoomsForSlots?.data?.roomsForSlots
+			: $RoomsForSlots?.data?.roomsForSlots?.filter((slot) => selectedDays.includes(slot.day));
+
+	function roomAvailable(room: any, slot: any): string {
+		if (slot.rooms.map((room) => room.name).includes(room)) {
+			return 'X';
+		}
+		return '';
+	}
+</script>
+
+<div class="text-center m-2">
+	<div class="text-4xl text-center mt-8 uppercase">Verfügbare Räume</div>
+
+	<div class="my-4">
+		<label class="label">
+			<span class="label-text">Tage auswählen:</span>
+		</label>
+		<div class="flex flex-wrap gap-2 justify-center">
+			{#each availableDays as day}
+				<label class="label cursor-pointer">
+					<input
+						type="checkbox"
+						class="checkbox checkbox-primary"
+						bind:group={selectedDays}
+						value={day}
+					/>
+					<span class="label-text ml-2">Tag {day}</span>
+				</label>
+			{/each}
+		</div>
+	</div>
+</div>
+<div class="overflow-x-auto w-full">
+	<div class="grid grid-cols-1">
+		<div class="overflow-x-auto">
+			<table class="table table-zebra w-90%">
+				<!-- head -->
+				<thead>
+					<tr>
+						<th>Slot</th>
+						{#each $RoomsForSlots?.data?.rooms as room}
+							<th>{room.name}</th>
+						{/each}
+					</tr>
+				</thead>
+				<tbody>
+					{#each filteredSlots as slot}
+						<tr>
+							<td class="font-bold text-right"> ({slot.day}, {slot.slot})</td>
+							{#each $RoomsForSlots?.data?.rooms as room}
+								<td>{roomAvailable(room.name, slot)}</td>
+							{/each}
+						</tr>
+					{/each}
+				</tbody>
+			</table>
+		</div>
+	</div>
+</div>
diff --git a/src/routes/rooms/+page.gql b/src/routes/rooms/+page.gql
deleted file mode 100644
index 50c8455..0000000
--- a/src/routes/rooms/+page.gql
+++ /dev/null
@@ -1,12 +0,0 @@
-query Rooms {
-	rooms {
-		name
-		seats
-		handicap
-		lab
-		placesWithSocket
-		exahm
-		seb
-		needsRequest
-	}
-}
diff --git a/src/routes/rooms/+page.server.gql b/src/routes/rooms/+page.server.gql
new file mode 100644
index 0000000..ee9c0a0
--- /dev/null
+++ b/src/routes/rooms/+page.server.gql
@@ -0,0 +1,26 @@
+query Rooms {
+	rooms {
+		name
+		seats
+		handicap
+		lab
+		placesWithSocket
+		exahm
+		seb
+		needsRequest
+	}
+	roomsForSlots {
+		day
+		slot
+		rooms {
+			name
+			seats
+			handicap
+			lab
+			placesWithSocket
+			exahm
+			seb
+			needsRequest
+		}
+	}
+}
diff --git a/src/routes/rooms/+page.svelte b/src/routes/rooms/+page.svelte
index b85aa15..d08356b 100644
--- a/src/routes/rooms/+page.svelte
+++ b/src/routes/rooms/+page.svelte
@@ -28,6 +28,8 @@
 			rooms?.sort((r1: any, r2: any) => r1.name.localeCompare(r2.name));
 		}
 	}
+
+	let roomsForSlots = $Rooms?.data?.roomsForSlots || [];
 </script>
 
 <div class="text-center m-2">