FLOE-149: moved the fieldset into the form

Moved the fieldset and radio buttons into the form with the checkboxes.