Added fieldsets, checkboxes