Regroup the edit form elements because 'completing' an item is independent from 'updating'