Added fieldsets and legends.  Changed the overall container of the form.