restructure css
Restructure CSS and javascript