Refactored CSS before implementation

Cleaned up and organized the CSS.  Optimized in some areas to leverage cascading and reuse.