Added new rights fields, moved required fields to the top with headings