modify layout & css
fix conflict