Toggle component fixes