Modify layout
Merge pull request #4268 from nutty898/develop_nutty_modify_layout

[ci skip]Modify layout