Updated UI as per design