change some css and js
fix conflict in main,js