Misc. display fixes
Merge branch 'fix-room-list'