Modify layout
Merge branch 'master' into master_nutty_code_criterion
Merge pull request #4267 from nutty898/master_nutty_modify_layout

[ci skip]Master nutty modify layout