Updated UI changes