Js improved and css added