Refactored create client
Improved create client UX