Added fieldset and legend tags for accessibility purposes