Refactored quotes css
Fixed merge conflicts