Working on client edit screen