[WIP] fix css
Fix css and JavaScript
Merge branch 'fix-css'