closed #2381: ControlSwitch was displayed ugly when adding more than one switch.
Merge pull request #3113 from dumganhar/iss2381-controlswitch

ControlSwitch was displayed ugly when adding more than one switch.