Updated UI Components and Connectors