More UI optimizations for CC