Agreed its becoming an issue. The problem is the sheer volume of rooms we will end up with if we start splitting things up like this.

I am open to suggestions....