Update report form to use fieldsets and labels