Added some CSS
Fixed conflict