modify the css
fix bug
fix comfict
fix bug
Merge pull request #537 from youyong205/master

fix many bug