Added form 'sections' and minor improvements