fix css
replace url
Merge branch 'develop'
fix css and url