diff --git a/onprc_ehr/resources/queries/ehr_lookups/connectedCages.sql b/onprc_ehr/resources/queries/ehr_lookups/connectedCages.sql
index 11b12359e..b80930159 100644
--- a/onprc_ehr/resources/queries/ehr_lookups/connectedCages.sql
+++ b/onprc_ehr/resources/queries/ehr_lookups/connectedCages.sql
@@ -54,11 +54,11 @@ FROM ehr_lookups.cage c
 
 --for the next 2 horizontal joins, use the highest effective row, determined above
 --find the highest cage with a non-separating divider
-LEFT JOIN ehr_lookups.cage joined ON (joined.cage_type != 'No Cage' and c.status.value != 'Unavailable' and c.room = joined.room and c.cagePosition.row = joined.cagePosition.row and joined.divider.countAsSeparate = false and c.cagePosition.columnIdx > joined.cagePosition.columnIdx)
+LEFT JOIN ehr_lookups.cage joined ON ((joined.cage_type != 'No Cage' or joined.cage_type != 'Unavailable Location') and c.status.value != 'Unavailable' and c.room = joined.room and c.cagePosition.row = joined.cagePosition.row and joined.divider.countAsSeparate = false and c.cagePosition.columnIdx > joined.cagePosition.columnIdx)
 
 --find the highest cage with a separating divider
-LEFT JOIN ehr_lookups.cage sep ON (sep.cage_type != 'No Cage' and c.room = sep.room and c.cagePosition.row = sep.cagePosition.row and sep.divider.countAsSeparate = true and c.cagePosition.columnIdx > sep.cagePosition.columnIdx)
+LEFT JOIN ehr_lookups.cage sep ON ((sep.cage_type != 'No Cage' or sep.cage_type != 'Unavailable Location') and c.room = sep.room and c.cagePosition.row = sep.cagePosition.row and sep.divider.countAsSeparate = true and c.cagePosition.columnIdx > sep.cagePosition.columnIdx)
 
-WHERE c.cage_type != 'No Cage'
+WHERE (c.cage_type != 'No Cage' or c.cage_type != 'Unavailable Location')
 
 GROUP BY c.room, c.cagePosition.row, c.cage, c.cagePosition.columnIdx, c.divider, c.divider.countAsSeparate, c.cage_type
\ No newline at end of file
diff --git a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js
index b331c6582..4ed4f4beb 100644
--- a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js
+++ b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js
@@ -184,8 +184,8 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
 
                 var rooms = Ext4.Object.getKeys(roomMap).sort();
                 var dividerWidth = 3;
-                var height = 75;
-                var cageWidth = 60;
+                var height = 115;
+                var cageWidth = 78;   //Modified: 5-27-2026
                 var hasCages = false;
 
                 Ext4.each(rooms, function(room, roomIdx){
@@ -285,7 +285,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
                                 }
 
                                 var animalItems = [];
-                                if (animals.length > 8){    //Modified: 7-5-2018  R.Blasa
+                                if (animals.length > 8) {    //Modified: 7-5-2018  R.Blasa
                                     animalItems.push({
                                         html: '<span style="font-size: 10px;">' + animals.length + ' animals</span>',
                                         border: false,
@@ -297,7 +297,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
                                 else if (animals.length){
                                     Ext4.each(animals, function(animal){
                                         animalItems.push({
-                                            html: '<span style="font-size: 9px;"><a>' + animal + '</a>' + (config.animalMap[animal] ? ': ' + Ext4.util.Format.round(config.animalMap[animal].getValue('Id/mostRecentWeight/mostRecentWeight'), 1) : '') + '</span>',
+                                            html: '<span style="font-size: 11px;"><a>' + animal + '</a>' + (config.animalMap[animal] ? ': ' + Ext4.util.Format.round(config.animalMap[animal].getValue('Id/mostRecentWeight/mostRecentWeight'), 1) : '') + '</span>',
                                             animal: animal,
                                             border: false,
                                             bodyStyle: {
@@ -359,8 +359,10 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
                                             bgColor = 'grey';
                                         }
                                     }
-                                    else if (status == 'Unavailable')
-                                    {
+                                    else if (cageType == 'Unavailable Location') {
+                                        bgColor = 'white';
+                                    }
+                                    else if (status == 'Unavailable') {
                                         bgColor = 'yellow';
                                     }
                                     else if (colorcage == 'Transfer Pending')
@@ -430,6 +432,13 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
                                 var type = row.get('cage_type');
                                 var cageType = config.cageTypeMap[row.get('cage_type')] || {};
                                 var suffix = cageType.abbreviation || '';
+                                var html_string = '';
+                                if (row.get('cage_type') == 'No Cage')
+                                  html_string = 'No Cage';
+
+                                if (row.get('cage_type') == 'Unavailable Location')
+                                    html_string = 'Unavailable Location';
+
                                 rowItems.push({
                                     border: false,
                                     style: {
@@ -453,7 +462,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
 
                                         //Modified: 4-8-2020 R.Blasa  Contains symbol representing divider types
                                      items: [{
-                                            html: row.get('cage_type') == 'No Cage' ? 'No Cage' : ('<span style="font-size: 11px;"><a>' + ri + colIdx + '</a>' + (cageType.sqft ? ' (' + (cageType.sqft / cageType.cageslots)+ suffix + ')' : '') +  (dividerInfo.displaychar ? ' [' + (dividerInfo.displaychar) + ']' : '') + '</span>'),
+                                            html: row.get('cage_type') == html_string ? html_string : ('<span style="font-size: 11px;"><a>' + ri + colIdx + '</a>' + (cageType.sqft ? ' (' + (cageType.sqft / cageType.cageslots)+ suffix + ')' : '') +  (dividerInfo.displaychar ? ' [' + (dividerInfo.displaychar) + ']' : '') + '</span>'),
                                         bodyStyle: {
                                             'background-color': 'transparent'
                                         },
@@ -634,6 +643,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
         Ext4.apply(this, {
             border: false,
             itemId: 'roomLayoutPanel',
+            width: 1450,
             defaults: {
                 border: false
             },