Fixes #1422, #1423- form layout issues