Restructured css and js