Adds fieldsets around package forms for better context