closed #2381: ControlSwitch was displayed ugly when adding more than one switch.