moved value/onoff controls to separate files