Updated Changes with more javascript and css