COMMONS-222: fix setting form layout