Combine more css classes, add columns and classes for DRM values