Final updates to the CC popup

#81