css cleanup and js cleanup