Revised channel and ent category class layouts