update layout css js
Merge branch 'release/layout_fix'