Added fields to main form