Updated the device selection with specific sub panels per device type.