Layout changes on forms
Merge branch 'Master2' into test_smidt