Adding the remaining fixes from yesterday's accommodation view