Mosaic feature request: One place to select inputs

I understand the two places where inputs are selected - either network card inputs (eg streaming, UPnP, Radio) or Control Board inputs (hardware inputs such as SPDIF1) talk to two different pieces of hardware.

But I find the construct confusing - I would like a more unified input selector.