Reworked grouping and handling of form fields.

 - Now have "fieldsets" which contain basic and extra fields