more cleanups and started to add a Rooms page