Redesign of CSS

CSS is messy, but it's getting there.