Organize the CSS some more