t222 - better default form layouts

Doing away with split layout of form elements.