Adjusted UX for the client