Last touches to the CC Popup before merge to master

#81