modified css
fix conflicts