Added fieldsets with optional labels, replaced spacers at views with fieldsets