Improve UX to be fill in a client