- fixed main form, new field layout