fix CSS and watch
fix css
Merge branch 'master' into next
fixing