Fixed js and css bugs