fix js and style