more work on client UI