Improved CSS and CSS class names