Script and css updated