first batch of layout changes, added form-groups etc