Added CustomComponentScreen