change the place of layout.
Merge branch 'bugfix/YIN-240' into develop