Add the new separation of editable vs non-editable controls.