Updated UI for testing