more changes on current_form_columns