Clean up CSS
More organization
And more organization on CSS