Updated css
Merged css