fix
refactoring js and css