diff --git a/configs/conferences/rc3/config.php b/configs/conferences/rc3/config.php
index a6479821..8a64a2e8 100644
--- a/configs/conferences/rc3/config.php
+++ b/configs/conferences/rc3/config.php
@@ -235,7 +235,7 @@ $CONFIG['ROOMS'] = array(
 	 * in $CONFIG['OVERVIEW'] oder im Feedback verwendet wird.
 	 */
 	'c3lounge' => array(
-		'DISPLAY' => 'Lounge',
+		'DISPLAY' => 'rC3 Lounge',
 		'DISPLAY_SHORT' => 'Lounge',
 		'WIDE' => true,
 
@@ -672,8 +672,8 @@ $CONFIG['ROOMS'] = array(
 	),
 
 	'gehacktesfromhell' => array(
-		'DISPLAY' => 'Gehacktes from Hell',
-		'DISPLAY_SHORT' => 'gehacktesfromhell',
+		'DISPLAY' => 'Gehacktes from Hell / Bierscheune',
+		'DISPLAY_SHORT' => 'Hell',
 		'STREAM' => 'gehacktes',
 		'PREVIEW' => true,
 		'TRANSLATION' => [
@@ -708,7 +708,7 @@ $CONFIG['ROOMS'] = array(
 	),
 
 	'xhain' => array(
-		'DISPLAY' => 'xHain',
+		'DISPLAY' => 'xHain Lichtung',
 		'DISPLAY_SHORT' => 'xHain',
 		'STREAM' => 'xhain',
 		'PREVIEW' => true,
diff --git a/template/overview.phtml b/template/overview.phtml
index d2f3c209..3fd03354 100644
--- a/template/overview.phtml
+++ b/template/overview.phtml
@@ -11,9 +11,19 @@
 		<? endif ?>
 		<div class="row room-group room-group-n<?=h($i++)?> room-group-<?=h(slugify($group))?>">
 
-			<? $count = count($rooms); $idx = 0 ?>
-			<? foreach($rooms as $room): ?>
-				<? 
+			<?
+				$count = count($rooms); 
+				$idx = 0;
+				usort($rooms, function ($a, $b) {
+					global $upcomingTalksPerRoom;
+					return (
+						$upcomingTalksPerRoom[ $a->getSlug() ]['next']['start'] 
+						<=> 
+						$upcomingTalksPerRoom[ $b->getSlug() ]['next']['start']
+					); 
+				});
+
+				foreach($rooms as $room): 
 					$is_wide = 0;
 					/* when the count is odd and this is the last item - make it full width */
 					if (($count % 2 == 1) && ($idx == $count - 1)) {
@@ -77,18 +87,22 @@
 
 								<? endif ?>
 
-								<? if($room->hasSchedule()): ?>
-									<? $upcoming = @$upcomingTalksPerRoom[ $room->getSlug() ] ?: [] ?>
+								<? if($room->hasSchedule()): 
+									$upcoming = @$upcomingTalksPerRoom[ $room->getSlug() ] ?: [];
+									$current = @$upcoming['current'];
+									$next = @$upcoming['next']; ?>
 									<div class="program-schedule">
-										<div class="talk current-talk" title="<?=h(@$upcoming['current']['title'] ?: 'none') ?>">
-                    <strong>Now (since <?=date('G:i', @$upcoming['current']['start']) ?>):</strong><br/>
-											<span class="t"><?=h(@$upcoming['current']['title'] ?: 'none') ?></span>
+										<? if($current['title']): ?>
+										<div class="talk current-talk" title="<?=h(@$current['title'] ?: 'none') ?>">
+											<strong>Now (since <?=date('G:i', @$upcoming['start']) ?>):</strong><br/>
+											<span class="t"><?=h(@$upcoming['title'] ?: 'none') ?></span>
 										</div>
-
-										<div class="talk next-talk" title="<?=h(@$upcoming['next']['title'] ?: 'none') ?>">
-											<strong>Next Talk (<?=date('G:i', @$upcoming['next']['start']) ?>):</strong><br/>
-											<span class="t"><?=h(@$upcoming['next']['title'] ?: 'none') ?></span>
+										<? endif; if($next['title']): ?>
+										<div class="talk next-talk" title="<?=h(@$next['title'] ?: 'none') ?>">
+											<strong>Next Talk (<?=date('G:i', @$next['start']) ?>):</strong><br/>
+											<span class="t"><?=h(@$next['title'] ?: 'none') ?></span>
 										</div>
+										<? endif ?>
 									</div>
 								<? endif ?>
 							</div>