Refactoring CSS for consitency

Making some improvements based on suggestions from a design review. This
simplifies the CSS and eliminates the need for multiple files.