Use new UI model in client - work in progress