Client list form tidying