CDK-539. Convert demo example to use views