Fine tune submit
Merge branch 'layout' into develop