Implemented support for group form field
Reordered form fields