Improvements in js and css