CSS and JS improved