Trimmed down form layout. issue#35