Updated UI structure