diff --git a/CHANGELOG.md b/CHANGELOG.md
index 632c423..3cd3428 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.11.2] - 2026-02-03
+
+### Changed
+
+- Calendar page room column now wider (200px) with proper left alignment
+- Room column displays building name on second row for better identification
+- Changed calendar table layout from fixed to auto for flexible column widths
+
 ## [0.11.1] - 2026-02-03
 
 ### Added
diff --git a/assets/css/admin.css b/assets/css/admin.css
index a2593f5..f119c07 100644
--- a/assets/css/admin.css
+++ b/assets/css/admin.css
@@ -976,7 +976,7 @@
 .bnb-calendar-table {
 	width: 100%;
 	border-collapse: collapse;
-	table-layout: fixed;
+	table-layout: auto;
 }
 
 .bnb-calendar-table th,
@@ -997,7 +997,8 @@
 .bnb-calendar-table th.room-header {
 	text-align: left;
 	padding-left: 10px;
-	min-width: 150px;
+	width: 200px;
+	min-width: 200px;
 }
 
 /* Calendar Day Cell */
@@ -1068,16 +1069,31 @@
 }
 
 /* Room Row in Multi-Room Calendar */
-.bnb-calendar-room {
+.bnb-calendar-table .bnb-calendar-room {
 	font-weight: 600;
 	text-align: left;
 	padding: 8px 10px;
 	background: #f6f7f7;
+	min-width: 200px;
+	white-space: nowrap;
 }
 
-.bnb-calendar-room small {
+.bnb-calendar-room a {
+	display: block;
+}
+
+.bnb-calendar-room .room-number {
 	font-weight: normal;
 	color: #646970;
+	margin-left: 5px;
+}
+
+.bnb-calendar-room .building-name {
+	display: block;
+	font-weight: normal;
+	font-size: 12px;
+	color: #646970;
+	margin-top: 2px;
 }
 
 /* Calendar Legend */
diff --git a/src/Admin/Calendar.php b/src/Admin/Calendar.php
index 9ab0322..be6d31b 100644
--- a/src/Admin/Calendar.php
+++ b/src/Admin/Calendar.php
@@ -256,16 +256,20 @@ final class Calendar {
 			<tbody>
 				<?php foreach ( $rooms as $room ) : ?>
 					<?php
-					$room_number  = get_post_meta( $room->ID, '_bnb_room_room_number', true );
-					$booked_dates = Availability::get_booked_dates( $room->ID, $year, $month );
+					$room_number   = get_post_meta( $room->ID, '_bnb_room_room_number', true );
+					$room_building = Room::get_building( $room->ID );
+					$booked_dates  = Availability::get_booked_dates( $room->ID, $year, $month );
 					?>
 					<tr>
 						<td class="bnb-calendar-room">
 							<a href="<?php echo esc_url( get_edit_post_link( $room->ID ) ); ?>">
 								<?php echo esc_html( $room->post_title ); ?>
+								<?php if ( $room_number ) : ?>
+									<span class="room-number">#<?php echo esc_html( $room_number ); ?></span>
+								<?php endif; ?>
 							</a>
-							<?php if ( $room_number ) : ?>
-								<br><small>#<?php echo esc_html( $room_number ); ?></small>
+							<?php if ( $room_building ) : ?>
+								<span class="building-name"><?php echo esc_html( $room_building->post_title ); ?></span>
 							<?php endif; ?>
 						</td>
 						<?php for ( $day = 1; $day <= $days_in_month; $day++ ) : ?>
diff --git a/wp-bnb.php b/wp-bnb.php
index 890d578..53c11d2 100644
--- a/wp-bnb.php
+++ b/wp-bnb.php
@@ -3,7 +3,7 @@
  * Plugin Name: WP BnB Management
  * Plugin URI: https://src.bundespruefstelle.ch/magdev/wp-bnb
  * Description: A comprehensive Bed & Breakfast management system for WordPress. Manage buildings, rooms, bookings, and guests.
- * Version: 0.11.1
+ * Version: 0.11.2
  * Requires at least: 6.0
  * Requires PHP: 8.3
  * Author: Marco Graetsch
@@ -24,7 +24,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 // Plugin version constant - MUST match Version in header above.
-define( 'WP_BNB_VERSION', '0.11.1' );
+define( 'WP_BNB_VERSION', '0.11.2' );
 
 // Plugin path constants.
 define( 'WP_BNB_PATH', plugin_dir_path( __FILE__ ) );