modify layout
Merge branch 'work'