CSS polish
Merge conflict
Merging X's sass