fixed bugs, updated js and css