Update Clients Screens based on Esther's feedback