diff --git a/src/lib/ConstraintsTable.svelte b/src/lib/ConstraintsTable.svelte
index 0de0be1..777f818 100644
--- a/src/lib/ConstraintsTable.svelte
+++ b/src/lib/ConstraintsTable.svelte
@@ -162,22 +162,41 @@
 							</ul>
 						{/if}</td
 					>
-					<td class={bgConstraints(exam.constraints)}
-						>{#if exam.constraints && exam.constraints.roomConstraints}
-							{#if exam.constraints.roomConstraints.placesWithSocket}
-								Plätze mit Steckdosen,
-							{/if}
-							{#if exam.constraints.roomConstraints.lab}
-								Labor,
-							{/if}
-							{#if exam.constraints.roomConstraints.exahm}
-								EXaHM,
-							{/if}
-							{#if exam.constraints.roomConstraints.seb}
-								SafeExamBrowser,
-							{/if}
-						{/if}</td
-					>
+					<td class={bgConstraints(exam.constraints)}>
+						{#if exam.constraints && exam.constraints.roomConstraints}
+							<div class="flex justify-between items-center w-full">
+								<div>
+									{#if exam.constraints.roomConstraints.allowedRooms && exam.constraints.roomConstraints.allowedRooms.length > 0}
+										{exam.constraints.roomConstraints.allowedRooms},
+									{/if}
+									{#if exam.constraints.roomConstraints.placesWithSocket}
+										Plätze mit Steckdosen,
+									{/if}
+									{#if exam.constraints.roomConstraints.lab}
+										Labor,
+									{/if}
+									{#if exam.constraints.roomConstraints.exahm}
+										EXaHM,
+									{/if}
+									{#if exam.constraints.roomConstraints.seb}
+										SafeExamBrowser,
+									{/if}
+								</div>
+								{#if exam.constraints.roomConstraints.kdpJiraURL}
+									<div class="flex justify-end">
+										<button
+											class="btn btn-sm"
+											on:click={() =>
+												window.open(exam.constraints.roomConstraints.kdpJiraURL, '_blank')}
+											disabled={!exam.constraints.roomConstraints.kdpJiraURL}
+										>
+											Jira-Ticket öffnen
+										</button>
+									</div>
+								{/if}
+							</div>
+						{/if}
+					</td>
 				</tr>
 			{/each}
 		</tbody>
diff --git a/src/routes/exam/constraints/+page.server.js b/src/routes/exam/constraints/+page.server.js
index 0934f44..7e6f4bc 100644
--- a/src/routes/exam/constraints/+page.server.js
+++ b/src/routes/exam/constraints/+page.server.js
@@ -26,10 +26,14 @@ export async function load({ params }) {
 					possibleDays
 					sameSlot
 					roomConstraints {
+						allowedRooms
 						placesWithSocket
 						lab
 						exahm
 						seb
+						kdpJiraURL
+						maxStudents
+						comments
 					}
 				}
 			}
diff --git a/src/routes/exam/constraints/[code=integer]/+page.server.js b/src/routes/exam/constraints/[code=integer]/+page.server.js
index 85cb95a..1bb8f3a 100644
--- a/src/routes/exam/constraints/[code=integer]/+page.server.js
+++ b/src/routes/exam/constraints/[code=integer]/+page.server.js
@@ -32,6 +32,7 @@ export async function load({ params }) {
                 possibleDays
                 sameSlot
                 roomConstraints {
+                    allowedRooms
                     placesWithSocket
                     lab
                     exahm
@@ -90,10 +91,28 @@ export async function load({ params }) {
 
 	const semesterData = await request(env.PLEXAMS_SERVER, semesterQuery);
 
+	const roomsQuery = gql`
+		query {
+			rooms {
+				name
+				seats
+				handicap
+				lab
+				placesWithSocket
+				needsRequest
+				exahm
+				seb
+			}
+		}
+	`;
+
+	const roomsData = await request(env.PLEXAMS_SERVER, roomsQuery);
+
 	return {
 		code: params.code,
 		exam: dataE.zpaExam,
 		constraints: dataC.constraintForAncode,
-		semesterConfig: semesterData.semesterConfig
+		semesterConfig: semesterData.semesterConfig,
+		rooms: roomsData.rooms
 	};
 }
diff --git a/src/routes/exam/constraints/[code=integer]/+page.svelte b/src/routes/exam/constraints/[code=integer]/+page.svelte
index 78465b7..1c57ef2 100644
--- a/src/routes/exam/constraints/[code=integer]/+page.svelte
+++ b/src/routes/exam/constraints/[code=integer]/+page.svelte
@@ -5,6 +5,7 @@
 	let constraints = data.constraints;
 	let exam = data.exam;
 	let semesterConfig = data.semesterConfig;
+	let rooms = data.rooms;
 
 	let days = semesterConfig.days.map((day) => {
 		return new Date(day.date).toLocaleDateString('de-DE', {
@@ -18,6 +19,7 @@
 	let constraintsInput = {
 		notPlannedByMe: false,
 		online: false,
+		allowedRooms: [],
 		placesWithSocket: false,
 		lab: false,
 		seb: false,
@@ -32,6 +34,7 @@
 		constraintsInput.notPlannedByMe = constraints.notPlannedByMe;
 		constraintsInput.online = constraints.online;
 		if (constraints.roomConstraints) {
+			constraintsInput.allowedRooms = constraints.roomConstraints.allowedRooms || [];
 			constraintsInput.placesWithSocket = constraints.roomConstraints.placesWithSocket;
 			constraintsInput.lab = constraints.roomConstraints.lab;
 			constraintsInput.seb = constraints.roomConstraints.seb;
@@ -171,6 +174,7 @@
 		<fieldset
 			class="fieldset bg-base-100 border-base-300 rounded-box w-64 border p-4"
 			class:bg-green-100={constraintsInput.lab}
+			class:border-green-500={constraintsInput.lab}
 		>
 			<label class="label">
 				<input type="checkbox" class="checkbox" bind:checked={constraintsInput.lab} />
@@ -181,6 +185,7 @@
 		<fieldset
 			class="fieldset bg-base-100 border-base-300 rounded-box w-64 border p-4"
 			class:bg-green-100={constraintsInput.seb}
+			class:border-green-500={constraintsInput.seb}
 		>
 			<label class="label">
 				<input type="checkbox" class="checkbox" bind:checked={constraintsInput.seb} />
@@ -191,6 +196,7 @@
 		<fieldset
 			class="fieldset bg-base-100 border-base-300 rounded-box w-64 border p-4"
 			class:bg-green-100={constraintsInput.exahm}
+			class:border-green-500={constraintsInput.exahm}
 		>
 			<label class="label">
 				<input type="checkbox" class="checkbox" bind:checked={constraintsInput.exahm} />
@@ -201,6 +207,7 @@
 		<fieldset
 			class="fieldset bg-base-100 border-base-300 rounded-box w-64 border p-4"
 			class:bg-green-100={constraintsInput.placesWithSocket}
+			class:border-green-500={constraintsInput.placesWithSocket}
 		>
 			<label class="label">
 				<input type="checkbox" class="checkbox" bind:checked={constraintsInput.placesWithSocket} />
@@ -211,6 +218,7 @@
 		<fieldset
 			class="fieldset bg-base-100 border-base-300 rounded-box w-64 border p-4"
 			class:bg-green-100={constraintsInput.online}
+			class:border-green-500={constraintsInput.online}
 		>
 			<label class="label">
 				<input type="checkbox" class="checkbox" bind:checked={constraintsInput.online} />
@@ -229,6 +237,15 @@
 						bind:value={constraintsInput.kdpJiraURL}
 						placeholder="https://example.com"
 					/>
+					{#if constraintsInput.kdpJiraURL}
+						<button
+							class="btn btn-sm ml-2"
+							on:click={() => window.open(constraintsInput.kdpJiraURL, '_blank')}
+							disabled={!constraintsInput.kdpJiraURL}
+						>
+							Link öffnen
+						</button>
+					{/if}
 				</label>
 				<label class="label mt-4">
 					<span class="label-text">Maximale Anzahl Studierende</span>
@@ -250,6 +267,36 @@
 			</fieldset>
 		</div>
 	{/if}
+	<div class="divider">
+		Einschränkung auf bestimmte Räume ({constraintsInput.allowedRooms.length} Räume ausgewählt)
+	</div>
+	<div class="flex w-full justify-center">
+		<div class="w-3/4 border rounded-box">
+			<div class="flex flex-wrap gap-2 justify-center">
+				{#each rooms as room}
+					{@const isSelected = constraintsInput.allowedRooms.includes(room.name)}
+					<!-- svelte-ignore a11y_click_events_have_key_events -->
+					<!-- svelte-ignore a11y_no_static_element_interactions -->
+					<div
+						class="badge badge-lg cursor-pointer p-4 {isSelected
+							? 'bg-green-100 border-green-500'
+							: 'bg-base-200'}"
+						on:click={() => {
+							if (isSelected) {
+								constraintsInput.allowedRooms = constraintsInput.allowedRooms.filter(
+									(r) => r !== room.name
+								);
+							} else {
+								constraintsInput.allowedRooms = [...constraintsInput.allowedRooms, room.name];
+							}
+						}}
+					>
+						{room.name}
+					</div>
+				{/each}
+			</div>
+		</div>
+	</div>
 	<div class="divider">Prüfungen, die im gleichen Slot stattfinden müssen</div>
 	<div class="flex w-full justify-center">
 		<div class="w-1/2 p-4">
@@ -288,7 +335,9 @@
 			<h3 class="text-center mb-4">Ausgewählte Prüfungen</h3>
 			<ul class="list-inside">
 				{#each sameSlotExams as selectedExam (selectedExam.ancode)}
-					<li class="flex justify-between items-center bg-green-100 p-2 mb-2 rounded-lg">
+					<li
+						class="flex justify-between items-center bg-green-100 border-green-500 p-2 mb-2 rounded-lg"
+					>
 						<span>
 							{selectedExam.ancode}. {selectedExam.module} ({selectedExam.mainExamer})
 						</span>
@@ -306,7 +355,9 @@
 			<fieldset
 				class="fieldset bg-base-100 border-base-300 rounded-box w-1/6 border p-4 m-2"
 				class:bg-red-100={constraintsInput?.excludeDays?.includes(day)}
+				class:border-red-500={constraintsInput?.excludeDays?.includes(day)}
 				class:bg-green-100={!constraintsInput?.excludeDays?.includes(day)}
+				class:border-green-500={!constraintsInput?.excludeDays?.includes(day)}
 			>
 				<label class="label">
 					<input
diff --git a/src/routes/exam/kdp/+page.server.js b/src/routes/exam/kdp/+page.server.js
index 760dc7e..3b19fb3 100644
--- a/src/routes/exam/kdp/+page.server.js
+++ b/src/routes/exam/kdp/+page.server.js
@@ -30,6 +30,7 @@ export async function load({ params }) {
 					possibleDays
 					sameSlot
 					roomConstraints {
+						allowedRooms
 						placesWithSocket
 						lab
 						exahm
diff --git a/src/routes/exam/kdp/+page.svelte b/src/routes/exam/kdp/+page.svelte
index c5f7ebc..b953f29 100644
--- a/src/routes/exam/kdp/+page.svelte
+++ b/src/routes/exam/kdp/+page.svelte
@@ -37,10 +37,11 @@
 			<th class="border border-gray-400 px-4 py-2">GS</th>
 			<th class="border border-gray-400 px-4 py-2">ID</th>
 			<th class="border border-gray-400 px-4 py-2">Räume (Studierende)</th>
+			<th class="border border-gray-400 px-4 py-2">Räume eingeschränkt</th>
 			<th class="border border-gray-400 px-4 py-2">Gruppen</th>
 			<th class="border border-gray-400 px-4 py-2">Jira</th>
-			<th class="border border-gray-400 px-4 py-2">Kommentar</th>
 			<th class="border border-gray-400 px-4 py-2">Vorgeplant</th>
+			<th class="border border-gray-400 px-4 py-2">Kommentar</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -81,6 +82,19 @@
 						fehlt
 					{/if}
 				</td>
+				<td
+					class="border border-gray-400 px-4 py-2"
+					style="background-color: {exam.constraints.roomConstraints.allowedRooms &&
+					exam.constraints.roomConstraints.allowedRooms.length > 0
+						? 'yellow'
+						: 'transparent'}"
+				>
+					<ul>
+						{#each exam.constraints.roomConstraints.allowedRooms as room}
+							<li>{room}</li>
+						{/each}
+					</ul>
+				</td>
 				<td class="border border-gray-400 px-4 py-2">{exam.zpaExam.groups.join(', ')}</td>
 				<td
 					class="border border-gray-400 px-4 py-2"
@@ -96,11 +110,6 @@
 						fehlt
 					{/if}
 				</td>
-				<td class="border border-gray-400 px-4 py-2">
-					{#if exam.constraints.roomConstraints.comments}
-						{exam.constraints.roomConstraints.comments}
-					{/if}
-				</td>
 				<td
 					class="border border-gray-400 px-4 py-2"
 					style="background-color: {exam.planEntry ? 'cyan' : 'transparent'}"
@@ -109,6 +118,11 @@
 						({exam.planEntry.dayNumber}, {exam.planEntry.slotNumber})
 					{/if}
 				</td>
+				<td class="border border-gray-400 px-4 py-2">
+					{#if exam.constraints.roomConstraints.comments}
+						{exam.constraints.roomConstraints.comments}
+					{/if}
+				</td>
 			</tr>
 		{/each}
 	</tbody>