updated TODOs for control.jsx, fixed Labels to include value property