Changing room number

Changes room number for issue #48.  

Also fixes tabbing?