Rearranged rules for edit form