Updated UI Design