Improves UI Component handling