some fix js and css
merge fix_js