Organizing the CSS
Fixed merges