modify layout
Merge branch 'jd'