AUI-1579 Improving / simplifying Surface demo