Fixes to the form builder, and restyling