Added support for optional form layouts.

Added control grouping, and separate labels.