Displaying controls correctly for all devices, can add/remove slave devices