[Client] Updated UI