Added multi-room support, changed layout