CSS class name improvements