Updated UI components