fixed form layout error
Merge remote-tracking branch 'refs/remotes/origin/1.0'