merge code fix js
fix js and css