I actually think the current UI is good enough.
There are some drawbacks though.
The speed of switching rooms is slower than before.
Then I think the option spacing is poorly done, making it difficult to distinguish between the main and secondary relationships.