Updated UI Structure