separate form into sections and tidy up