reorganized css and js