Re-arranged entry change form fields.