Adjustments to faculty area, lavatory.

Marks the commit before bathroom-bath=room (lavatory) is moved.