Css changed minor
Fixed merge conflicts