updated the UI experience on Client App