Demo template improvement.
Demo template improvement.