More work on the new room page.  Fixes #6 and Fixes #9