Improve CS++DeviceGui's