Add css
Fix conflict