AUI-1173 Improve surface demo