fixed layout
by zhanyi01
Merge branch 'dev' into gh-pages
by zhanyi01