Added correct edit form items (based on krista's comments.