got the room screen and descriptions in the right order
added a refactoring TODO