Fix up fields, add widgets, forms to json, add settings