Cleaning CSS Up Some

Lots more cleanup needed.