Some fixes in client new and edit views