Genericizing 'control rows' and removed subject_control_bar