Add client form, need UI improvements by Fran