Improving test/demo html