Client names as per wireframes, closing issue #30