Cleaned up db-fields, and fixed the custom fields not appearing in the form.